Diff of the two buildlogs: -- --- b1/build.log 2024-05-05 12:22:31.669222203 +0000 +++ b2/build.log 2024-05-05 12:26:14.003749789 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Sat Jun 7 06:38:07 -12 2025 -I: pbuilder-time-stamp: 1749321487 +I: Current time: Mon May 6 02:22:34 +14 2024 +I: pbuilder-time-stamp: 1714911754 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz] I: copying local configuration @@ -27,52 +27,84 @@ dpkg-source: info: applying 1001_testsuite_UTF-8.patch I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/66446/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/3582234/tmp/hooks/D01_modify_environment starting +debug: Running on codethink04-arm64. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +'/bin/sh' -> '/bin/bash' +lrwxrwxrwx 1 root root 9 May 5 12:22 /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/3582234/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/3582234/tmp/hooks/D02_print_environment starting I: set - BUILDDIR='/build/reproducible-path' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' - BUILD_ARCH='arm64' - DEBIAN_FRONTEND='noninteractive' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="2" [2]="21" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu") + BASH_VERSION='5.2.21(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=arm64 + DEBIAN_FRONTEND=noninteractive DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=12 ' - DISTRIBUTION='unstable' - HOME='/root' - HOST_ARCH='arm64' + DIRSTACK=() + DISTRIBUTION=unstable + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=aarch64 + HOST_ARCH=arm64 IFS=' ' - INVOCATION_ID='47cfe3ab30c146259774c0f537b3de1e' - 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='66446' - PS1='# ' - PS2='> ' + INVOCATION_ID=28fc9d297c1944a38024cc9707d76fed + LANG=C + LANGUAGE=nl_BE:nl + LC_ALL=C + MACHTYPE=aarch64-unknown-linux-gnu + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnu + PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path + PBCURRENTCOMMANDLINEOPERATION=build + PBUILDER_OPERATION=build + PBUILDER_PKGDATADIR=/usr/share/pbuilder + PBUILDER_PKGLIBDIR=/usr/lib/pbuilder + PBUILDER_SYSCONFDIR=/etc + PIPESTATUS=([0]="0") + POSIXLY_CORRECT=y + PPID=3582234 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.SqqxZunY/pbuilderrc_Vwcr --distribution unstable --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.SqqxZunY/b1 --logfile b1/build.log git-remote-hg_1.0.4~ds-1.dsc' - SUDO_GID='109' - SUDO_UID='104' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://192.168.101.4:3128' + PWD=/ + SHELL=/bin/bash + SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix + SHLVL=3 + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.SqqxZunY/pbuilderrc_3zUD --distribution unstable --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.SqqxZunY/b2 --logfile b2/build.log git-remote-hg_1.0.4~ds-1.dsc' + SUDO_GID=109 + SUDO_UID=104 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://192.168.101.4:3128 I: uname -a - Linux codethink03-arm64 6.1.0-20-cloud-arm64 #1 SMP Debian 6.1.85-1 (2024-04-11) aarch64 GNU/Linux + Linux i-capture-the-hostname 6.1.0-20-cloud-arm64 #1 SMP Debian 6.1.85-1 (2024-04-11) aarch64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Jun 7 14:05 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/66446/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 May 5 07:43 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/3582234/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -210,7 +242,7 @@ Get: 84 http://deb.debian.org/debian unstable/main arm64 mercurial-git all 1.0.3-1 [63.5 kB] Get: 85 http://deb.debian.org/debian unstable/main arm64 sharness all 1.0.0-1.1 [28.6 kB] Get: 86 http://deb.debian.org/debian unstable/main arm64 xmlto arm64 0.0.28-2.1 [33.3 kB] -Fetched 43.6 MB in 1s (77.8 MB/s) +Fetched 43.6 MB in 0s (172 MB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libpython3.11-minimal:arm64. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 19744 files and directories currently installed.) @@ -504,8 +536,8 @@ Setting up tzdata (2024a-4) ... Current default time zone: 'Etc/UTC' -Local time is now: Sat Jun 7 18:38:40 UTC 2025. -Universal Time is now: Sat Jun 7 18:38:40 UTC 2025. +Local time is now: Sun May 5 12:22:53 UTC 2024. +Universal Time is now: Sun May 5 12:22:53 UTC 2024. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17029-2) ... @@ -589,7 +621,11 @@ Building tag database... -> Finished parsing the build-deps I: Building the package -I: Running cd /build/reproducible-path/git-remote-hg-1.0.4~ds/ && 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-remote-hg_1.0.4~ds-1_source.changes +I: user script /srv/workspace/pbuilder/3582234/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for unstable +I: user script /srv/workspace/pbuilder/3582234/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/reproducible-path/git-remote-hg-1.0.4~ds/ && 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-remote-hg_1.0.4~ds-1_source.changes dpkg-buildpackage: info: source package git-remote-hg dpkg-buildpackage: info: source version 1.0.4~ds-1 dpkg-buildpackage: info: source distribution unstable @@ -644,13 +680,16 @@ /bin/sh bidi.t --verbose /bin/sh helper.t --verbose expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repos && + ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero + cd gitrepo && + test_expect_code 2 git-hg-helper help 2> ../help ) + # remotes should be in help output + grep origin help expecting success: ( @@ -664,18 +703,6 @@ expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && - setup_repos && - - ( - cd gitrepo && - test_expect_code 2 git-hg-helper help 2> ../help - ) - # remotes should be in help output - grep origin help - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - ( git init -q gitrepo && cd gitrepo && @@ -709,6 +736,15 @@ test_cmp expected actual +expecting success: + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) + [master (root-commit) 79c6ce2] add älphà Author: A U Thor 1 file changed, 1 insertion(+) @@ -728,12 +764,12 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found -Cloning into 'gitrepo'... searching for changes adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 4 files +Cloning into 'gitrepo'... ok 1 - setup expecting success: @@ -741,13 +777,13 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero -Cloning into 'gitrepo'... ok 1 - setup expecting success: test_when_finished "rm -rf gitrepo*" && git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero +Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -762,21 +798,21 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 80baf8f60523 adding changesets +new changesets 3c0dc422ac88 adding manifests adding file changes added 1 changesets with 1 changes to 1 files -adding changesets -new changesets 80baf8f60523 -adding manifests -adding file changes +new changesets 3c0dc422ac88 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -added 1 changesets with 1 changes to 1 files -new changesets 80baf8f60523 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 3c0dc422ac88 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 2 - cloning @@ -846,24 +882,24 @@ Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways searching for changes no changes found searching for changes -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 4 files +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 80baf8f60523:7f5bc2aa0de1 +new changesets 3c0dc422ac88:87a4fde048fb progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) @@ -871,11 +907,10 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 80baf8f60523:7f5bc2aa0de1 +new changesets 3c0dc422ac88:87a4fde048fb progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) -Cloning into 'gitrepo'... ok 3 - cloning with branches expecting success: @@ -908,10 +943,11 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/feature-a feature-a -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 1 - encoding @@ -955,8 +991,6 @@ Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 beta -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] [master 86bf00d] add foo Author: A U Thor 1 file changed, 1 insertion(+) @@ -972,6 +1006,9 @@ 1 file changed, 1 deletion(-) delete mode 100644 foo/bar Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... ok 2 - subcommand repo - no local proxy expecting success: @@ -989,20 +1026,32 @@ test_cmp expected actual -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +adding remote bookmark feature-a +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets 3c0dc422ac88:2f10db1533da +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'next' (0/1) adding changesets adding manifests adding file changes adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 80baf8f60523:3c3021f13b09 +new changesets 3c0dc422ac88:2f10db1533da progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 4 - cloning with bookmarks expecting success: @@ -1024,26 +1073,7 @@ check_bookmark hgrepo devel devel -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] no changes found -adding changesets -adding manifests -adding file changes -adding remote bookmark feature-a -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 80baf8f60523:3c3021f13b09 -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'next' (0/1) -Cloning into 'gitrepo'... ok 4 - cloning with bookmarks expecting success: @@ -1065,78 +1095,84 @@ check_bookmark hgrepo devel devel +searching for changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 3 changes to 3 files +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes adding remote bookmark devel -Cloning into 'gitrepo'... adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 80baf8f60523:3c3021f13b09 +new changesets 3c0dc422ac88:2f10db1533da progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 4eee4639f2b0 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +adding remote bookmark devel +adding remote bookmark feature-a +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets 3c0dc422ac88:2f10db1533da +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'next' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 5 changesets with 3 changes to 3 files new changesets 362b656574c3:54f595cbdf1f -[devel 5ae19e3] devel +[devel 29de632] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/5) +[devel 29de632] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes -adding remote bookmark devel -adding remote bookmark feature-a -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 80baf8f60523:3c3021f13b09 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'next' (0/1) -[devel 5ae19e3] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +added 1 changesets with 1 changes to 1 files +new changesets 1325182d6973 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found +no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 3 - subcommand repo - with local proxy expecting success: @@ -1179,10 +1215,6 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways ok 5 - update bookmark expecting success: @@ -1200,51 +1232,59 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes adding remote bookmark devel adding remote bookmark feature-a added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets 80baf8f60523:82813ae5c709 +new changesets 3c0dc422ac88:b867240bb214 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -Cloning into 'gitrepo'... -[feature-b 3ea7746] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes adding remote bookmark devel -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding remote bookmark feature-a added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets 80baf8f60523:82813ae5c709 -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +new changesets 3c0dc422ac88:b867240bb214 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +[feature-b 5afe8de] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[feature-b 5afe8de] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +no changes found +searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 3b9d2e1642d0 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 2 - file removal expecting success: @@ -1274,27 +1314,53 @@ test_cmp expected actual -[feature-b 3ea7746] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha +adding changesets +adding manifests +adding file changes [master 862befc] add beta Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 beta -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes added 1 changesets with 1 changes to 1 files +new changesets 56a78cfc5a29 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +ok 6 - new bookmark + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + hg init hgrepo && + cd hgrepo && + + touch content && + hg add content && + + > ../expected && + author_test alpha "" "H G Wells " && + author_test beta "beta" "beta " && + author_test gamma "gamma (comment)" "gamma " && + author_test delta "" "Unknown " && + author_test epsilon "epsilon" "epsilon " && + author_test zeta "zeta " && + author_test eta " eta " "eta " && + author_test theta "theta < test@example.com >" "theta " && + author_test iota "iota >test@example.com>" "iota " && + author_test kappa "kappa < test example com>" "kappa " && + author_test lambda "lambda@example.com" "Unknown " && + author_test mu "mu.mu@example.com" "Unknown " + ) && + + git clone "hg::hgrepo" gitrepo && + git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual && + + test_cmp expected actual + ok 6 - new bookmark expecting success: @@ -1329,10 +1395,20 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files +searching for changes +searching for changes +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp ok 4 - subcommands hg-rev and git-rev expecting success: @@ -1372,46 +1448,6 @@ grep "git marks" output ) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -searching for changes -ok 6 - new bookmark - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && - - ( - hg init hgrepo && - cd hgrepo && - - touch content && - hg add content && - - > ../expected && - author_test alpha "" "H G Wells " && - author_test beta "beta" "beta " && - author_test gamma "gamma (comment)" "gamma " && - author_test delta "" "Unknown " && - author_test epsilon "epsilon" "epsilon " && - author_test zeta "zeta " && - author_test eta " eta " "eta " && - author_test theta "theta < test@example.com >" "theta " && - author_test iota "iota >test@example.com>" "iota " && - author_test kappa "kappa < test example com>" "kappa " && - author_test lambda "lambda@example.com" "Unknown " && - author_test mu "mu.mu@example.com" "Unknown " - ) && - - git clone "hg::hgrepo" gitrepo && - git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual && - - test_cmp expected actual - -searching for changes /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets @@ -1421,7 +1457,6 @@ new changesets 362b656574c3:7cd99375c843 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] searching for changes @@ -1431,17 +1466,16 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files -new changesets 17ef7c2530e0:06cacdd7780a +new changesets cd457a601ee3:06687b07c2b6 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/3e010d1c4c08-d00bea76-backup.hg ok 3 - git tags expecting success: @@ -1480,32 +1514,42 @@ test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/ebcc16e8af86-c53b95e1-backup.hg +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +no changes found searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets c7027ad43a12 -progress revision 4 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - + 0c803f5...9057d7d master -> origin/master (forced update) - + 0c803f5...9057d7d branches/default -> origin/branches/default (forced update) -HEAD is now at 9057d7d four -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +added 1 changesets with 1 changes to 1 files +searching for changes +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -searching for changes +added 1 changesets with 1 changes to 1 files (+1 heads) +new changesets a0ccf37a0480 +progress revision 4 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + + 78a9af8...e12344f master -> origin/master (forced update) + + 78a9af8...e12344f branches/default -> origin/branches/default (forced update) +HEAD is now at e12344f four +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways Loading hg marks ... Loading git marks ... Performing garbage collection on git commits ... @@ -1515,7 +1559,6 @@ Trimmed git marks from #12 down to #2 Writing hg marks ... Writing git marks ... -Cloning into 'gitrepo'... Loading hg marks ... Trimmed hg marks from #5 down to #0 Writing hg marks ... @@ -1546,18 +1589,20 @@ test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes added 12 changesets with 12 changes to 1 files -new changesets 305e868ec6fa:f4d3c27cd81e +new changesets 8ad9c350c94d:65b5ab0a7a26 +adding changesets +adding manifests +adding file changes +added 12 changesets with 12 changes to 1 files +new changesets 8ad9c350c94d:65b5ab0a7a26 +progress revision walk 'bookmarks/master' (11/11) +progress revision 0 'master' (0/12) progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) -Cloning into 'gitrepo'... ok 7 - authors expecting success: @@ -1597,16 +1642,6 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -added 12 changesets with 12 changes to 1 files -new changesets d40360ea9033:31ae44094e16 -progress revision walk 'bookmarks/master' (11/11) -progress revision 0 'master' (0/12) ok 7 - authors expecting success: @@ -1646,70 +1681,53 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected +marked working directory as branch gamma +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +adding remote bookmark not-master +added 2 changesets with 1 changes to 1 files +new changesets 5889597089fe:3320583a8de0 +1 local changesets published adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 2e4c6f4e5673 +new changesets 0c884db00995 +progress revision 1 'default' (0/1) +progress revision 2 'gamma' (0/1) progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -marked working directory as branch gamma Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -searching for changes +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 35172b2afa7f -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - f75c55a..35c086b master -> origin/master - f75c55a..35c086b branches/default -> origin/branches/default -searching for changes -adding changesets +added 2 changesets with 2 changes to 1 files +new changesets a88b64109a1b:fc9ca38878f9 adding changesets adding manifests -adding manifests -adding file changes -adding remote bookmark not-master -added 2 changesets with 1 changes to 1 files adding file changes -new changesets 5889597089fe:3320583a8de0 -1 local changesets published added 2 changesets with 2 changes to 1 files -new changesets 51101a84b063:bf6cf71d30ff +new changesets a88b64109a1b:fc9ca38878f9 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -progress revision 1 'default' (0/1) -progress revision 2 'gamma' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 51101a84b063:8cb74b578721 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo/.hg/strip-backup/bf6cf71d30ff-a0d3d303-backup.hg -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/8cb74b578721-be2086c0-backup.hg /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] searching for changes no changes found searching for changes @@ -1722,10 +1740,50 @@ adding manifests adding file changes added 1 changesets with 0 changes to 0 files +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes searching for changes searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets db31d50616ec +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo/.hg/strip-backup/fc9ca38878f9-cebe6954-backup.hg +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + 70fd91a..42ac656 master -> origin/master + 70fd91a..42ac656 branches/default -> origin/branches/default +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/fc9ca38878f9-cebe6954-backup.hg +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +searching for changes +adding changesets +adding manifests +adding file changes +searching for changes +added 2 changesets with 2 changes to 1 files (+1 heads) +new changesets da0af9fba061:776fd6dc94eb +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files (+1 heads) +new changesets da0af9fba061:776fd6dc94eb +progress revision 2 'default' (0/2) +progress revision 2 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + + 9bc2ecf...39b2146 master -> origin/master (forced update) + + 9bc2ecf...39b2146 branches/default -> origin/branches/default (forced update) ok 6 - subcommand [some-repo] expecting success: @@ -1760,21 +1818,9 @@ check gitrepo/sub_hg_b HEAD zero_sub_hg_b && check gitrepo/sub_git HEAD zero_sub_git -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets 1130905005e5:513bd09ce3f4 -progress revision 2 'default' (0/2) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - + 576ef7e...750dc7c master -> origin/master (forced update) - + 576ef7e...750dc7c branches/default -> origin/branches/default (forced update) -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] + + 9bc2ecf...39b2146 master -> origin/master (forced update) + + 9bc2ecf...39b2146 branches/default -> origin/branches/default (forced update) ok 4 - hg branch expecting success: @@ -1808,6 +1854,10 @@ test_cmp expected actual +[master (root-commit) 223a6f6] add alpha + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 alpha ok 8 - strip expecting success: @@ -1834,20 +1884,6 @@ check_branch hgrepo default two -[master (root-commit) 223a6f6] add alpha - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 alpha -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets 1130905005e5:bc69ed97fd99 -progress revision 2 'default' (0/2) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - + bd1fb0f...281b404 master -> origin/master (forced update) - + bd1fb0f...281b404 branches/default -> origin/branches/default (forced update) ok 8 - strip expecting success: @@ -1885,75 +1921,91 @@ searching for changes 0 files updated, 0 files merged, 0 files removed, 0 files unresolved Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +adding remote bookmark not-master +added 1 changesets with 1 changes to 1 files +new changesets 16869bbe54be +1 local changesets published +progress revision 1 'default' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes adding remote bookmark master added 2 changesets with 2 changes to 1 files -new changesets 666054b66a97:b0ae9b12b260 +new changesets 0a97b2a8656a:1fb1b510ae1e +adding changesets +adding manifests +adding file changes +progress revision walk 'bookmarks/default' (1/1) +progress revision 0 'default' (0/2) +adding remote bookmark master +added 2 changesets with 2 changes to 1 files +new changesets 0a97b2a8656a:1fb1b510ae1e progress revision walk 'bookmarks/default' (1/1) progress revision 0 'default' (0/2) +[default 41522da] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[default 41522da] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ [master (root-commit) e9a16bb] zero_sub_git Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content_sub_git -[default 96a0795] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -searching for changes -adding changesets -adding manifests -adding file changes -adding remote bookmark not-master -added 1 changesets with 1 changes to 1 files -new changesets 16869bbe54be -1 local changesets published no changes found -progress revision 1 'default' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - 6827f59..96a0795 default -> default -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + 4924de6..41522da default -> default +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... +no changes found +searching for changes adding changesets adding manifests adding file changes -adding remote bookmark master -added 2 changesets with 2 changes to 1 files -new changesets 12d67c988954:a9891cd22311 -progress revision walk 'bookmarks/default' (1/1) -progress revision 0 'default' (0/2) -[default e8e2831] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + fffffff..41522da default -> default +searching for changes +no changes found +searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets a3b070e07990:d6b508e6e3d5 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +added 2 changesets with 2 changes to 2 files +searching for changes +searching for changes +To hg::../hgrepo2 + * [new branch] branches/default -> branches/default + * [new branch] master -> master + * [new branch] not-master -> not-master + ! [rejected] alpha -> alpha (already exists) +error: failed to push some refs to 'hg::../hgrepo2' +hint: Updates were rejected because the tag already exists in the remote. ok 9 - remote push with master bookmark expecting success: @@ -1977,54 +2029,6 @@ check_branch hgrepo default one -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -searching for changes -To hg::../hgrepo2 - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] not-master -> not-master - ! [rejected] alpha -> alpha (already exists) -error: failed to push some refs to 'hg::../hgrepo2' -no changes found -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ -[master (root-commit) 64caca5] one - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content -searching for changes -hint: Updates were rejected because the tag already exists in the remote. -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..e8e2831 default -> default -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into './sub_hg_a'... -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::../hgrepo - * [new branch] master -> master ok 9 - remote push with master bookmark expecting success: @@ -2048,6 +2052,17 @@ check_branch hgrepo default one +Cloning into 'gitrepo'... +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ +[master (root-commit) 64caca5] one + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/gitrepo/.git/ +[master (root-commit) 64caca5] one + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content ok 5 - hg tags expecting success: @@ -2087,13 +2102,13 @@ test_cmp expected actual +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] [master (root-commit) a663549] add alpha Author: A U Thor Date: Mon Jan 1 00:00:00 2007 +0000 1 file changed, 1 insertion(+) create mode 100644 alpha -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] [master ea3e397] add beta Author: A U Thor Date: Mon Jan 1 00:00:00 2007 +0100 @@ -2114,27 +2129,86 @@ Date: Mon Jan 1 00:00:00 2007 -0130 1 file changed, 1 insertion(+) create mode 100644 epsilon -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/gitrepo/.git/ adding changesets adding manifests adding file changes -[master (root-commit) 64caca5] one - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content +added 2 changesets with 3 changes to 3 files +new changesets e1a11b685231:2b88ef2dc7e5 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes added 1 changesets with 1 changes to 1 files -new changesets 5d6a48249c0e -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +To hg::../hgrepo + * [new branch] master -> master +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::../hgrepo + * [new branch] master -> master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Cloning into './sub_hg_a'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 5 changes to 5 files changeset: 0:6e2126489d3d tag: tip user: A U Thor date: Mon Jan 01 00:00:00 2007 +0230 summary: one -Cloning into './sub_hg_b'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +changeset: 0:6e2126489d3d +tag: tip +user: A U Thor +date: Mon Jan 01 00:00:00 2007 +0230 +summary: one + +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets f030fa3118aa +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_hg_b'... +ok 10 - remote push from master branch + +expecting success: + test_when_finished "rm -rf gitrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) && + + git clone "hg::hgrepo" gitrepo && + check gitrepo HEAD zero + ok 10 - remote push from master branch expecting success: @@ -2151,31 +2225,24 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -To hg::../hgrepo - * [new branch] master -> master +added 5 changesets with 5 changes to 5 files +new changesets 87c8f82b00d0:21e96c99dac4 +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/5) adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 4e21f43560c1 +new changesets fb3b1f1f7714 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files Cloning into './sub_git'... done. ok 7 - subcommand sub initial update (hg and git subrepos) @@ -2203,29 +2270,19 @@ check gitrepo/sub_hg_a/sub_hg_a_x HEAD zero_sub_hg_a_x && check gitrepo/sub_hg_b/sub_git HEAD zero_sub_git -changeset: 0:6e2126489d3d -tag: tip -user: A U Thor -date: Mon Jan 01 00:00:00 2007 +0230 -summary: one - Cloning into 'gitrepo'... -ok 10 - remote push from master branch - -expecting success: - test_when_finished "rm -rf gitrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - ) && - - git clone "hg::hgrepo" gitrepo && - check gitrepo HEAD zero - +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 5 changes to 5 files +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -2234,11 +2291,16 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 1921bb7e68b6 +new changesets 7b02bc6e5c42 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 7b02bc6e5c42 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] ok 11 - remote cloning expecting success: @@ -2252,34 +2314,6 @@ ) Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files -new changesets 87c8f82b00d0:21e96c99dac4 -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/5) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 1921bb7e68b6 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 28aab491b79a -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) ok 11 - remote cloning expecting success: @@ -2293,29 +2327,37 @@ ) Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 28aab491b79a +new changesets 7b02bc6e5c42 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 7b02bc6e5c42 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +ok 6 - test timezones + +# passed all 6 test(s) +1..6 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways ok 12 - moving remote clone expecting success: @@ -2337,10 +2379,7 @@ check_bookmark hgrepo devel devel -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] no changes found -Cloning into 'gitrepo'... ok 12 - moving remote clone expecting success: @@ -2362,56 +2401,48 @@ check_bookmark hgrepo devel devel -ok 6 - test timezones - -# passed all 6 test(s) -1..6 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes adding remote bookmark devel added 1 changesets with 1 changes to 1 files -new changesets 1921bb7e68b6 +new changesets 7b02bc6e5c42 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... -[devel fb3c0b8] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes adding remote bookmark devel added 1 changesets with 1 changes to 1 files -new changesets 28aab491b79a +new changesets 7b02bc6e5c42 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel 8c62dd0] devel +[devel df59be5] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +[devel df59be5] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways no changes found searching for changes adding changesets @@ -2435,18 +2466,6 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -added 2 changesets with 2 changes to 1 files -new changesets 1921bb7e68b6:3b8081e266dd -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) ok 13 - remote update bookmark expecting success: @@ -2464,44 +2483,57 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -[feature-b 35e7932] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... adding changesets adding manifests adding file changes adding remote bookmark devel added 2 changesets with 2 changes to 1 files -new changesets 28aab491b79a:34acf8e5a6ba +new changesets 7b02bc6e5c42:b949976afa71 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -[feature-b 9b18343] feature-b +[feature-b 5b02c9d] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +adding remote bookmark devel +added 2 changesets with 2 changes to 1 files +new changesets 7b02bc6e5c42:b949976afa71 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +[feature-b 5b02c9d] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +no changes found +searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets b46ec0984cf9:596f07e97e11 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +added 1 changesets with 1 changes to 1 files +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files ok 14 - remote new bookmark expecting success: @@ -2528,41 +2560,6 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into './sub_hg_a'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark feature-b -added 3 changesets with 3 changes to 1 files -new changesets 1921bb7e68b6:a7c60dbccf64 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 4019d49481e1:a2ebc4bd9412 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(leaving bookmark devel) ok 14 - remote new bookmark expecting success: @@ -2589,33 +2586,71 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... -Cloning into './sub_hg_a/sub_hg_a_x'... -[master 3ed88ce] diverged - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes adding remote bookmark devel adding remote bookmark feature-b added 3 changesets with 3 changes to 1 files -new changesets 28aab491b79a:748e871b25a7 +new changesets 7b02bc6e5c42:0f31fa81419f +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets e35d0f9b0332 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +adding remote bookmark devel +adding remote bookmark feature-b +added 3 changesets with 3 changes to 1 files +new changesets 7b02bc6e5c42:0f31fa81419f +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +Cloning into 'gitrepo'... 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark devel) -Cloning into './sub_hg_b'... +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(leaving bookmark devel) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 44c254e1869a:4196b76df154 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +[master 9a5fb10] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[master 9a5fb10] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Cloning into './sub_hg_a'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 0ae3645e97e1 +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + ! [rejected] master -> master (non-fast-forward) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -2625,7 +2660,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 54950f5cba62 +new changesets 0ae3645e97e1 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo' @@ -2636,14 +2671,11 @@ ! [rejected] master -> master (non-fast-forward) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -[master 58a00f8] diverged - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 78528822c51b:c0438d2a0b62 +new changesets bb3b32099674:a33dbbf666b5 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 15 - remote push diverged @@ -2677,37 +2709,6 @@ check_bookmark hgrepo diverge "bump bookmark" -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Cloning into './sub_hg_b/sub_git'... -done. -ok 8 - subcommand sub initial recursive update - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update - -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 405cb0251c2d -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo' -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. - ! [rejected] master -> master (non-fast-forward) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways ok 15 - remote push diverged expecting success: @@ -2739,24 +2740,90 @@ check_bookmark hgrepo diverge "bump bookmark" +Cloning into './sub_hg_a/sub_hg_a_x'... +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 38c55a657aa6 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +Cloning into './sub_hg_b'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 2188f821c540:ae2025775b20 +adding changesets +adding changesets +adding manifests +adding manifests +adding file changes +adding file changes +adding remote bookmark devel adding remote bookmark devel adding remote bookmark diverge +adding remote bookmark diverge adding remote bookmark feature-b +adding remote bookmark feature-b +added 4 changesets with 4 changes to 1 files added 4 changesets with 4 changes to 1 files -new changesets 1921bb7e68b6:54950f5cba62 +new changesets 7b02bc6e5c42:0ae3645e97e1 +new changesets 7b02bc6e5c42:0ae3645e97e1 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/4) +Cloning into './sub_hg_b/sub_git'... +done. +created new head created new head -[diverge 844afb2] diverge +ok 8 - subcommand sub initial recursive update + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update + +[diverge 3470db1] diverge + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[diverge 3470db1] diverge Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +updating bookmark diverge +added 1 changesets with 1 changes to 1 files (+1 heads) +new changesets 419ddb748acb +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + ! [rejected] diverge -> diverge (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + ! [rejected] diverge -> diverge (non-fast-forward) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -2767,7 +2834,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 3e0cdeb23543 +new changesets 419ddb748acb To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo ! [rejected] diverge -> diverge (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo' @@ -2776,16 +2843,6 @@ hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] diverge -> diverge (non-fast-forward) -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -added 4 changesets with 4 changes to 1 files -new changesets 28aab491b79a:405cb0251c2d -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/4) ok 16 - remote update bookmark diverge expecting success: @@ -2803,12 +2860,27 @@ check_bookmark hgrepo feature-c feature-c Cloning into 'gitrepo'... -created new head -[diverge 2069b40] diverge - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +ok 16 - remote update bookmark diverge + +expecting success: + test_when_finished "rm -rf gitrepo*" && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git checkout --quiet -b feature-c HEAD^ && + echo feature-c > content && + git commit -a -m feature-c && + git push --quiet origin feature-c + ) && + + check_bookmark hgrepo feature-c feature-c + +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways adding changesets @@ -2818,57 +2890,45 @@ adding remote bookmark diverge adding remote bookmark feature-b added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets 1921bb7e68b6:3e0cdeb23543 +new changesets 7b02bc6e5c42:419ddb748acb WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/4) -[feature-c 42a893a] feature-c +adding changesets +adding manifests +adding file changes +adding remote bookmark devel +adding remote bookmark diverge +adding remote bookmark feature-b +added 5 changesets with 5 changes to 1 files (+1 heads) +new changesets 7b02bc6e5c42:419ddb748acb +WARNING: Branch 'default' has more than one head, consider merging +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/4) +[feature-c 9d1643b] feature-c + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[feature-c 9d1643b] feature-c Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] searching for changes adding changesets adding manifests adding file changes -updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets ee52b8d43768 -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - ! [rejected] diverge -> diverge (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo' -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. - ! [rejected] diverge -> diverge (non-fast-forward) -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) -ok 16 - remote update bookmark diverge - -expecting success: - test_when_finished "rm -rf gitrepo*" && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git checkout --quiet -b feature-c HEAD^ && - echo feature-c > content && - git commit -a -m feature-c && - git push --quiet origin feature-c - ) && - - check_bookmark hgrepo feature-c feature-c - -Cloning into 'gitrepo'... ok 17 - remote new bookmark multiple branch head checking known breakage: @@ -2908,55 +2968,6 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets 28aab491b79a:ee52b8d43768 -WARNING: Branch 'default' has more than one head, consider merging -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/4) -[feature-c 864e1ee] feature-c - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 0de02b5f30aa -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master aa18c44] copy - Author: A U Thor - 1 file changed, 2 insertions(+) - create mode 100644 content-copy -[master 8fc4063] moved - Author: A U Thor - 1 file changed, 0 insertions(+), 0 deletions(-) - rename content-copy => content-moved (100%) ok 17 - remote new bookmark multiple branch head expecting success: @@ -2997,10 +3008,47 @@ ) Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets eadbdd2db2cc +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 4075e2d] copy + Author: A U Thor + 1 file changed, 2 insertions(+) + create mode 100644 content-copy +[master 3574d18] moved + Author: A U Thor + 1 file changed, 0 insertions(+), 0 deletions(-) + rename content-copy => content-moved (100%) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets eadbdd2db2cc +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 4075e2d] copy + Author: A U Thor + 1 file changed, 2 insertions(+) + create mode 100644 content-copy +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +[master 3574d18] moved + Author: A U Thor + 1 file changed, 0 insertions(+), 0 deletions(-) + rename content-copy => content-moved (100%) +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways no changes found searching for changes adding changesets @@ -3008,25 +3056,24 @@ adding file changes added 2 changesets with 2 changes to 2 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - 797aa4a..8fc4063 master -> master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + d370d1d..3574d18 master -> master +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +no changes found +searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets a4700434064a:be67cf15eea0 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +added 2 changesets with 2 changes to 2 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + fffffff..3574d18 master -> master +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into './sub_hg_a'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] not ok 18 - push commits with copy and rename # TODO known breakage expecting success: @@ -3059,53 +3106,6 @@ echo "ø~?" > expected && test_cmp expected actual -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 46b887509e87 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master 2c54828] copy - Author: A U Thor - 1 file changed, 2 insertions(+) - create mode 100644 content-copy -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -[master d647bc9] moved - Author: A U Thor - 1 file changed, 0 insertions(+), 0 deletions(-) - rename content-copy => content-moved (100%) -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 460f14d47a56:841c6db6e61b -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a/sub_hg_a_x'... -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..d647bc9 master -> master -warning: filename contains '?', which is reserved on Windows: 'ø~?' -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets e3479cefca45 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... ok 18 - push commits with copy and rename expecting success: @@ -3138,19 +3138,46 @@ echo "ø~?" > expected && test_cmp expected actual +Cloning into 'gitrepo'... +warning: filename contains '?', which is reserved on Windows: 'ø~?' /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 8892b62c6674:4ecc3986242f +new changesets 2c7f7b804370:e327c08b3a74 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) warning: filename contains '?', which is reserved on Windows: 'ø~?' -Cloning into './sub_hg_b/sub_git'... -done. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Cloning into './sub_hg_a'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets ccc3fc903710:09399656f8be +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_a/sub_hg_a_x'... warning: filename contains '?', which is reserved on Windows: 'ø~?' +warning: filename contains '?', which is reserved on Windows: 'ø~?' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 150aafddc4a3 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... +Cloning into './sub_hg_b'... Cloning into 'gitrepo'... WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways @@ -3158,9 +3185,11 @@ adding manifests adding file changes added 3 changesets with 4 changes to 2 files -new changesets 7226e0883abe:4210874b3b26 +new changesets 1b74dc150fd9:7dfece2bee82 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 19 - fetch special filenames expecting success: @@ -3199,41 +3228,20 @@ printf "content\næ rø\n" > expected && test_cmp expected actual -warning: filename contains '?', which is reserved on Windows: 'ø~?' -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 5ce324ca0ff4 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 7a20044..44330fe master -> origin/master - 7a20044..44330fe branches/default -> origin/branches/default -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -Updating 7a20044..44330fe -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +added 2 changesets with 3 changes to 3 files +new changesets 8ff8e48f2811:24a7f72051af +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) adding changesets adding manifests adding file changes added 3 changesets with 4 changes to 2 files -new changesets 26cdac01b95d:c7b4262b45f5 -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 48ed51b33017 +new changesets 85e3d200ec0d:6f99d757235c progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) ok 19 - fetch special filenames expecting success: @@ -3272,39 +3280,44 @@ printf "content\næ rø\n" > expected && test_cmp expected actual -[master 6711d24] utf-8 +Cloning into './sub_hg_b/sub_git'... +done. +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 3a9bc305b273 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 365b0e1] utf-8 Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 "\303\246 r\303\270" -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 1756438cb4b0 +new changesets eeb708e3accc +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 49ea05b] utf-8 + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 "\303\246 r\303\270" +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - af32a6e..6711d24 master -> master -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - cb93c7a..3401330 branches/default -> origin/branches/default - cb93c7a..3401330 master -> origin/master -HEAD is now at cb93c7a substate_hg_a -Cloning into 'gitrepo'... -1 files updated, 0 files merged, 0 files removed, 0 files unresolved + 965680b..365b0e1 master -> master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] searching for changes @@ -3312,18 +3325,29 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets f4d19795c4c9 -progress revision 1 'default' (0/1) +new changesets 13951491f5a4 +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + f749b58..fd99223 master -> origin/master + f749b58..fd99223 branches/default -> origin/branches/default +no changes found +Updating f749b58..fd99223 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets ee1b33662cdf -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 2908e23..539786f branches/default -> origin/branches/default - 2908e23..539786f master -> origin/master -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..49ea05b master -> master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 20 - push special filenames expecting success: @@ -3369,30 +3393,8 @@ check_bookmark hgrepo new_bmark fi -[master bb49a53] utf-8 - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 "\303\246 r\303\270" -HEAD is now at 2908e23 zero_sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -no changes found -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..bb49a53 master -> master -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -ok 9 - subcommand sub subsequent recursive update - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --rebase - ok 20 - push special filenames expecting success: @@ -3438,6 +3440,41 @@ check_bookmark hgrepo new_bmark fi +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 433e64d19e8d +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a + 52ce217..fcb5dfa branches/default -> origin/branches/default + 52ce217..fcb5dfa master -> origin/master +HEAD is now at 52ce217 substate_hg_a +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets fff5ff16e28a +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + 16e524a..b4f5caa branches/default -> origin/branches/default + 16e524a..b4f5caa master -> origin/master +HEAD is now at 16e524a zero_sub_hg_a_x +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +ok 9 - subcommand sub subsequent recursive update + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update --rebase + +Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] @@ -3450,22 +3487,38 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 03489569aa59:cae618e4e1c4 +new changesets 45e857b9d91b:6e8f34e5c057 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 0ddd58f zero -HEAD is now at 0ddd58f zero -HEAD is now at 171c10e good branch +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +HEAD is now at f46f933 zero +HEAD is now at f46f933 zero +HEAD is now at ce1ef34 good branch +adding changesets +adding manifests +adding file changes +adding remote bookmark bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +added 4 changesets with 4 changes to 1 files +new changesets 45e857b9d91b:666ba0bcf4eb +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at f46f933 zero +HEAD is now at f46f933 zero +HEAD is now at ce1ef34 good branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 171c10e..4cb15ec branches/good_branch -> branches/good_branch - 3473fa3..50770a0 good_bmark -> good_bmark - 3473fa3..e14623e master -> master + ce1ef34..94ed868 branches/good_branch -> branches/good_branch + 20130ba..e775797 good_bmark -> good_bmark + 20130ba..79747fb master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) @@ -3476,46 +3529,14 @@ hint: counterpart. If you want to integrate the remote changes, use 'git pull' hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 3473fa3..e14623e master -> master - 3473fa3..50770a0 good_bmark -> good_bmark - 171c10e..4cb15ec branches/good_branch -> branches/good_branch + 20130ba..79747fb master -> master + 20130ba..e775797 good_bmark -> good_bmark + ce1ef34..94ed868 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets ab61623489e0:f4ff82240498 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at bb08e01 zero -HEAD is now at bb08e01 zero -HEAD is now at 60502d0 good branch -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 951c341ca16a:aeebe61c3482 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found @@ -3545,9 +3566,9 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..e02ee81 branches/good_branch -> branches/good_branch - fffffff..372b094 good_bmark -> good_bmark - fffffff..9f85979 master -> master + fffffff..94ed868 branches/good_branch -> branches/good_branch + fffffff..e775797 good_bmark -> good_bmark + fffffff..79747fb master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) @@ -3558,21 +3579,20 @@ hint: counterpart. If you want to integrate the remote changes, use 'git pull' hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..9f85979 master -> master - fffffff..372b094 good_bmark -> good_bmark - fffffff..e02ee81 branches/good_branch -> branches/good_branch + fffffff..79747fb master -> master + fffffff..e775797 good_bmark -> good_bmark + fffffff..94ed868 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into './sub_hg_a'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +Cloning into 'gitrepo'... ok 21 - remote big push expecting success: @@ -3649,35 +3669,15 @@ fi ) -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets d79e43d7f08f:5d2e7e681acd -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_a/sub_hg_a_x'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 4af576f652cc -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets c72eb463289d:0b553cd824b9 +new changesets 13c49c6676e9:7a35777943ee progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. ok 21 - remote big push expecting success: @@ -3754,23 +3754,44 @@ fi ) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Cloning into './sub_hg_a'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 91d86242d321:3faa411ecd8f +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_a/sub_hg_a_x'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... -searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 36b3cab8f4c3 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - f7139c3..d7b56dc master -> origin/master - f7139c3..d7b56dc branches/default -> origin/branches/default -Updating f7139c3..d7b56dc -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +new changesets 71c892c8d129 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_hg_b'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 6be55732a7f0:5a5dd9508771 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_b/sub_git'... +done. +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -3781,28 +3802,22 @@ adding remote bookmark bad_bmark adding remote bookmark good_bmark added 3 changesets with 3 changes to 1 files -new changesets c0a4bf3dca81:4ad26a6ae6fd +new changesets 5b33c148e413:99131dd643ec progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'bad_branch' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets fb21f7cebf78 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - fd7e910..ef5a2ac branches/default -> origin/branches/default - fd7e910..ef5a2ac master -> origin/master -HEAD is now at fd7e910 substate_hg_a - Successfully rebased and updated detached HEAD. +adding remote bookmark bad_bmark +adding remote bookmark good_bmark +added 3 changesets with 3 changes to 1 files +new changesets 5b33c148e413:d06fe3793f86 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'bad_branch' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] searching for changes @@ -3810,13 +3825,19 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets d0b3ec9d6751 -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - cd27570..f42bb40 branches/default -> origin/branches/default - cd27570..f42bb40 master -> origin/master -HEAD is now at cd27570 zero_sub_hg_a_x - Successfully rebased and updated detached HEAD. +new changesets 3f57113ef5a0 +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + 58d57ab..664f818 master -> origin/master + 58d57ab..664f818 branches/default -> origin/branches/default +Updating 58d57ab..664f818 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -3827,10 +3848,10 @@ adding file changes updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets 7eb7a2829758 +new changesets 82495c71dbb0 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 569d32b..2045da5 good_bmark -> good_bmark - 569d32b..8e4e008 master -> master + a6c1f79..c1053a4 good_bmark -> good_bmark + a6c1f79..b62712b master -> master ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' @@ -3838,52 +3859,101 @@ hint: its remote counterpart. If you want to integrate the remote changes, hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 569d32b..8e4e008 master -> master - 569d32b..2045da5 good_bmark -> good_bmark + a6c1f79..b62712b master -> master + a6c1f79..c1053a4 good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 2ce31b16411a +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a + e436952..5c9311f branches/default -> origin/branches/default + e436952..5c9311f master -> origin/master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +HEAD is now at e436952 substate_hg_a + Successfully rebased and updated detached HEAD. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +updating bookmark bad_bmark +added 1 changesets with 1 changes to 1 files +new changesets be13bbc61d84 +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..c1053a4 good_bmark -> good_bmark + fffffff..b62712b master -> master + ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) + ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + fffffff..b62712b master -> master + fffffff..c1053a4 good_bmark -> good_bmark + ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) no changes found + ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) progress revision 3 'bad_branch' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - ed255c6..5abae9e branches/bad_branch -> origin/branches/bad_branch - 569d32b..5abae9e bad_bmark -> origin/bad_bmark - + 2045da5...569d32b good_bmark -> origin/good_bmark (forced update) - + 8e4e008...569d32b master -> origin/master (forced update) -ok 10 - subcommand sub subsequent recursive update -- rebase - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --merge - -Cloning into 'gitrepo'... + f4644c2..2a7a3df branches/bad_branch -> origin/branches/bad_branch + a6c1f79..2a7a3df bad_bmark -> origin/bad_bmark + + c1053a4...a6c1f79 good_bmark -> origin/good_bmark (forced update) + + b62712b...a6c1f79 master -> origin/master (forced update) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +searching for changes adding changesets adding manifests adding file changes -adding remote bookmark bad_bmark -adding remote bookmark good_bmark -added 3 changesets with 3 changes to 1 files -new changesets d40e7d3ae1d8:5edc9e1e590e -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'bad_branch' (0/2) +added 1 changesets with 1 changes to 1 files +new changesets 36cdfa5a0018 +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + 5ecf82e..36e5a5f branches/default -> origin/branches/default + 5ecf82e..36e5a5f master -> origin/master +no changes found +updating bookmark good_bmark +2 local changesets published +WARNING: Branch 'default' has more than one head, consider merging +progress revision 3 'bad_branch' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + 3562dcc..f216976 branches/bad_branch -> origin/branches/bad_branch + a6c1f79..b62712b branches/default -> origin/branches/default + a6c1f79..f216976 bad_bmark -> origin/bad_bmark +HEAD is now at 5ecf82e zero_sub_hg_a_x + Successfully rebased and updated detached HEAD. /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 569d32b..2045da5 good_bmark -> good_bmark - 569d32b..8e4e008 master -> master + a6c1f79..c1053a4 good_bmark -> good_bmark + a6c1f79..b62712b master -> master ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' @@ -3891,8 +3961,8 @@ hint: its remote counterpart. If you want to integrate the remote changes, hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 569d32b..8e4e008 master -> master - 569d32b..2045da5 good_bmark -> good_bmark + a6c1f79..b62712b master -> master + a6c1f79..c1053a4 good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ok 22 - remote big push non fast forward @@ -3939,50 +4009,9 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -updating bookmark bad_bmark -added 1 changesets with 1 changes to 1 files -new changesets 3e361372a3dd -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..af090aa good_bmark -> good_bmark - fffffff..b8e109d master -> master - ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) - ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..b8e109d master -> master - fffffff..af090aa good_bmark -> good_bmark - ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) - ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found -updating bookmark good_bmark -2 local changesets published -WARNING: Branch 'default' has more than one head, consider merging -progress revision 3 'bad_branch' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - f84375d..1b88694 branches/bad_branch -> origin/branches/bad_branch - 36c21d5..b8e109d branches/default -> origin/branches/default - 36c21d5..1b88694 bad_bmark -> origin/bad_bmark /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found @@ -4040,6 +4069,13 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six +ok 10 - subcommand sub subsequent recursive update -- rebase + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update --merge + Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] @@ -4052,18 +4088,35 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets f203649b93ab:aedd36220a66 +new changesets f190b9959fac:e41664776f2e progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) +Cloning into 'gitrepo'... +HEAD is now at 8a882c1 zero +HEAD is now at 8a882c1 zero +HEAD is now at 131040b good branch +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +adding remote bookmark bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +added 4 changesets with 4 changes to 1 files +new changesets f190b9959fac:d753e38b47f7 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 8a882c1 zero Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +HEAD is now at 8a882c1 zero [master (root-commit) e9a16bb] zero_sub_git Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content_sub_git -HEAD is now at 0076197 zero -HEAD is now at 0076197 zero -HEAD is now at c4afbc2 good branch +HEAD is now at b3ae85c good branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -4075,22 +4128,82 @@ adding file changes added 9 changesets with 9 changes to 1 files (+7 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + d486a48...5ec425c branches/bad_branch -> branches/bad_branch (forced update) - c4afbc2..3348cfe branches/good_branch -> branches/good_branch - + 934f4a0...8960171 bad_bmark1 -> bad_bmark1 (forced update) - + 934f4a0...42575e7 bad_bmark2 -> bad_bmark2 (forced update) - 934f4a0..1b8a3bc good_bmark -> good_bmark - 934f4a0..f807471 master -> master + + e4ba152...8c09ba5 branches/bad_branch -> branches/bad_branch (forced update) + 131040b..2a9d87d branches/good_branch -> branches/good_branch + + 734b4ac...3c34f98 bad_bmark1 -> bad_bmark1 (forced update) + + 734b4ac...d405075 bad_bmark2 -> bad_bmark2 (forced update) + 734b4ac..38caa4b good_bmark -> good_bmark + 734b4ac..9587df0 master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - 934f4a0..f807471 master -> master - 934f4a0..1b8a3bc good_bmark -> good_bmark - c4afbc2..3348cfe branches/good_branch -> branches/good_branch + 734b4ac..9587df0 master -> master + 734b4ac..38caa4b good_bmark -> good_bmark + 131040b..2a9d87d branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + 934f4a0...8960171 bad_bmark1 -> bad_bmark1 (forced update) - + 934f4a0...42575e7 bad_bmark2 -> bad_bmark2 (forced update) - + d486a48...5ec425c branches/bad_branch -> branches/bad_branch (forced update) + + 734b4ac...3c34f98 bad_bmark1 -> bad_bmark1 (forced update) + + 734b4ac...d405075 bad_bmark2 -> bad_bmark2 (forced update) + + e4ba152...8c09ba5 branches/bad_branch -> branches/bad_branch (forced update) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + + fffffff...b313a51 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...b4e54b5 branches/good_branch -> branches/good_branch (forced update) + + fffffff...3c34f98 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...d405075 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...3f79647 good_bmark -> good_bmark (forced update) + + fffffff...30ec367 master -> master (forced update) + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + + fffffff...30ec367 master -> master (forced update) + + fffffff...3f79647 good_bmark -> good_bmark (forced update) + + fffffff...b4e54b5 branches/good_branch -> branches/good_branch (forced update) + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + fffffff...3c34f98 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...d405075 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...b313a51 branches/bad_branch -> branches/bad_branch (forced update) Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] @@ -4098,39 +4211,23 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 2badffab51e2:71d3965ac923 +new changesets ef1cf806f857:3a81c99b4aae progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp Cloning into './sub_hg_a'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets b4f97ef9b85f:0a8d93d8a37d /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 44cbf211e88d:9d60eb183311 +new changesets 7a0bfa119715:700c73a6e9cd progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -HEAD is now at 4a3d60e zero -HEAD is now at 4a3d60e zero ok 23 - remote big push force expecting success: @@ -4171,104 +4268,8 @@ check_bookmark hgrepo new_bmark Cloning into './sub_hg_a/sub_hg_a_x'... -HEAD is now at feabc6b good branch -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets d8723d459ba5 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...4a76706 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...439eca3 branches/good_branch -> branches/good_branch (forced update) - + fffffff...9554b42 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...9e57dd0 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...d72786a good_bmark -> good_bmark (forced update) - + fffffff...aaaff45 master -> master (forced update) - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - + fffffff...aaaff45 master -> master (forced update) - + fffffff...d72786a good_bmark -> good_bmark (forced update) - + fffffff...439eca3 branches/good_branch -> branches/good_branch (forced update) - * [new branch] new_bmark -> new_bmark /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] - * [new branch] branches/new_branch -> branches/new_branch - + fffffff...9554b42 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...9e57dd0 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...4a76706 branches/bad_branch -> branches/bad_branch (forced update) -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 05860641f4b9:a7739d1ed8ce -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 28ba71508fcf -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - a200e1d..e618b3d master -> origin/master - a200e1d..e618b3d branches/default -> origin/branches/default -Updating a200e1d..e618b3d -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) ok 23 - remote big push force expecting success: @@ -4308,17 +4309,62 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -Cloning into 'gitrepo'... +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 57798c9a1655 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_hg_b'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 0648566b3091:448d177e6215 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_b/sub_git'... +done. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets e6ec8bca6a13 +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + 6345096..613cfc3 master -> origin/master + 6345096..613cfc3 branches/default -> origin/branches/default +Updating 6345096..613cfc3 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets b7791c8cdfad +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a + 6b105ea..e7e96d1 branches/default -> origin/branches/default + 6b105ea..e7e96d1 master -> origin/master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes @@ -4326,28 +4372,19 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 2e0e0649cc4a:d2ba683df277 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 7a2e3adce1d7 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - f38fb34..c4d4bb0 branches/default -> origin/branches/default - f38fb34..c4d4bb0 master -> origin/master -HEAD is now at c5a30cf zero -HEAD is now at f38fb34 substate_hg_a -HEAD is now at c5a30cf zero -Updating f38fb34..c4d4bb0 +new changesets 8b8a92024d49:7bfd935a5f43 +HEAD is now at 6b105ea substate_hg_a +Updating 6b105ea..e7e96d1 Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -HEAD is now at 696a3e8 good branch +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 570704e zero +HEAD is now at 570704e zero +HEAD is now at 5afec76 good branch +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] searching for changes @@ -4355,25 +4392,38 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 79c1b8c91b2a +new changesets 0f2dab684853 progress revision 1 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - a67b0f3..d70c1e0 branches/default -> origin/branches/default - a67b0f3..d70c1e0 master -> origin/master -HEAD is now at a67b0f3 zero_sub_hg_a_x -Updating a67b0f3..d70c1e0 + bbd82ad..ee67e8d branches/default -> origin/branches/default + bbd82ad..ee67e8d master -> origin/master +HEAD is now at bbd82ad zero_sub_hg_a_x +Updating bbd82ad..ee67e8d Fast-forward content_sub_hg_a_x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +adding remote bookmark bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +added 4 changesets with 4 changes to 1 files +new changesets 8b8a92024d49:5eda8e06c885 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 696a3e8..b208852 branches/good_branch -> branches/good_branch - 2b5742c..60c482c good_bmark -> good_bmark - 2b5742c..e17b26c master -> master + 5afec76..c630255 branches/good_branch -> branches/good_branch + 4d65d1c..e83ada3 good_bmark -> good_bmark + 4d65d1c..29ef91b master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) @@ -4384,14 +4434,17 @@ hint: counterpart. If you want to integrate the remote changes, use 'git pull' hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 2b5742c..e17b26c master -> master - 2b5742c..60c482c good_bmark -> good_bmark - 696a3e8..b208852 branches/good_branch -> branches/good_branch + 4d65d1c..29ef91b master -> master + 4d65d1c..e83ada3 good_bmark -> good_bmark + 5afec76..c630255 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +HEAD is now at 570704e zero +HEAD is now at 570704e zero +HEAD is now at 0010ec1 good branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found @@ -4401,14 +4454,14 @@ WARNING: various enhanced features might fail in subtle ways no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 696a3e8..b208852 branches/good_branch -> branches/good_branch - 2b5742c..60c482c good_bmark -> good_bmark - 2b5742c..e17b26c master -> master + 5afec76..c630255 branches/good_branch -> branches/good_branch + 4d65d1c..e83ada3 good_bmark -> good_bmark + 4d65d1c..29ef91b master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - 2b5742c..e17b26c master -> master - 2b5742c..60c482c good_bmark -> good_bmark - 696a3e8..b208852 branches/good_branch -> branches/good_branch + 4d65d1c..29ef91b master -> master + 4d65d1c..e83ada3 good_bmark -> good_bmark + 5afec76..c630255 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ok 11 - subcommand sub subsequent recursive update -- merge @@ -4418,30 +4471,13 @@ test_sub_foreach -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets ec9cec85bd05:167027b626ca -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at 521b0e3 zero -HEAD is now at 521b0e3 zero -HEAD is now at db4770e good branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..c9c612d branches/good_branch -> branches/good_branch - fffffff..813e07e good_bmark -> good_bmark - fffffff..b84cb81 master -> master + fffffff..10e08f7 branches/good_branch -> branches/good_branch + fffffff..e83ada3 good_bmark -> good_bmark + fffffff..29ef91b master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) @@ -4452,14 +4488,28 @@ hint: counterpart. If you want to integrate the remote changes, use 'git pull' hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..b84cb81 master -> master - fffffff..813e07e good_bmark -> good_bmark - fffffff..c9c612d branches/good_branch -> branches/good_branch + fffffff..29ef91b master -> master + fffffff..e83ada3 good_bmark -> good_bmark + fffffff..10e08f7 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..10e08f7 branches/good_branch -> branches/good_branch + fffffff..e83ada3 good_bmark -> good_bmark + fffffff..29ef91b master -> master + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + fffffff..29ef91b master -> master + fffffff..e83ada3 good_bmark -> good_bmark + fffffff..10e08f7 branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch ok 24 - remote big push dry-run expecting success: @@ -4505,26 +4555,6 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..c9c612d branches/good_branch -> branches/good_branch - fffffff..813e07e good_bmark -> good_bmark - fffffff..b84cb81 master -> master - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - fffffff..b84cb81 master -> master - fffffff..813e07e good_bmark -> good_bmark - fffffff..c9c612d branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git -Cloning into 'gitrepo'... ok 24 - remote big push dry-run expecting success: @@ -4570,113 +4600,142 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 0403b57e97eb:f331059118da +new changesets e8fda1991b10:e4ad6665cfef progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp Cloning into 'gitrepo'... +Cloning into './sub_hg_a'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into './sub_hg_a'... +adding changesets adding changesets adding manifests +adding manifests +adding file changes adding file changes adding remote bookmark bad_bmark1 adding remote bookmark bad_bmark2 adding remote bookmark good_bmark +added 2 changesets with 3 changes to 3 files +new changesets de3b39476240:536987551f8b added 4 changesets with 4 changes to 1 files -new changesets fa4a043c5d0c:370262b1de5c +new changesets e33a67e651eb:4b43e8f81665 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -HEAD is now at 705f302 zero -HEAD is now at 705f302 zero -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets ab34f90f15ea:b5f8c266df52 -HEAD is now at c850b75 good branch progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 168353e zero +HEAD is now at 168353e zero Cloning into './sub_hg_a/sub_hg_a_x'... +HEAD is now at 59efbc0 good branch +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 014a40c43280 +new changesets 8c80bbc44df2 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_b'... +adding changesets +adding manifests +adding file changes +adding remote bookmark bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +added 4 changesets with 4 changes to 1 files +new changesets 2c03ef3aa7db:33d4652fd4cc +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + 01eaf3d...12fdaf3 branches/bad_branch -> branches/bad_branch (forced update) - c850b75..25a7aca branches/good_branch -> branches/good_branch - + fc59236...e3b4477 bad_bmark1 -> bad_bmark1 (forced update) - + fc59236...4f6021d bad_bmark2 -> bad_bmark2 (forced update) - fc59236..1b1a731 good_bmark -> good_bmark - fc59236..2346e4b master -> master + + c5057e5...1ef2c4b branches/bad_branch -> branches/bad_branch (forced update) + 59efbc0..007f758 branches/good_branch -> branches/good_branch + + 9cc56f7...f902336 bad_bmark1 -> bad_bmark1 (forced update) + + 9cc56f7...88a40e0 bad_bmark2 -> bad_bmark2 (forced update) + 9cc56f7..e59aec2 good_bmark -> good_bmark + 9cc56f7..6120647 master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - fc59236..2346e4b master -> master - fc59236..1b1a731 good_bmark -> good_bmark - c850b75..25a7aca branches/good_branch -> branches/good_branch + 9cc56f7..6120647 master -> master + 9cc56f7..e59aec2 good_bmark -> good_bmark + 59efbc0..007f758 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fc59236...e3b4477 bad_bmark1 -> bad_bmark1 (forced update) - + fc59236...4f6021d bad_bmark2 -> bad_bmark2 (forced update) - + 01eaf3d...12fdaf3 branches/bad_branch -> branches/bad_branch (forced update) -Cloning into './sub_hg_b'... + + 9cc56f7...f902336 bad_bmark1 -> bad_bmark1 (forced update) + + 9cc56f7...88a40e0 bad_bmark2 -> bad_bmark2 (forced update) + + c5057e5...1ef2c4b branches/bad_branch -> branches/bad_branch (forced update) +HEAD is now at ec81961 zero +HEAD is now at ec81961 zero +HEAD is now at 79b169b good branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets d779264c0837:a5bf1276c8d9 +new changesets d848b00c6633:307f733f9fc0 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into './sub_hg_b/sub_git'... done. -Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + + fffffff...939e5c1 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...4d96b01 branches/good_branch -> branches/good_branch (forced update) + + fffffff...3ae6b42 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...681a356 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...af90e91 good_bmark -> good_bmark (forced update) + + fffffff...810a0e5 master -> master (forced update) + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + + fffffff...810a0e5 master -> master (forced update) + + fffffff...af90e91 good_bmark -> good_bmark (forced update) + + fffffff...4d96b01 branches/good_branch -> branches/good_branch (forced update) + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + fffffff...3ae6b42 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...681a356 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...939e5c1 branches/bad_branch -> branches/bad_branch (forced update) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets 2e2ee3d2af15:794eb7d4c64f -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -hg 2cb939af7e60361e6169391ca0101ad1f96c0ea8 b5f8c266df52b3c5807768009dc5fb10f15d0d8a sub_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo -hg 07ed5c1ebb895ba9ceb8234b1ca4621c46af63e8 014a40c43280b139677991a42ab2b609b9753016 sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a -hg 5523acd944944104106a38b2f33d008e6e65f6e8 a5bf1276c8d92fefb33a6a5f767918928b1259b6 sub_hg_b /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg 05f3e1b11fe398df1712d096abe4792699bb14c6 536987551f8be4627805b74ab89e3bbcef37c45f sub_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg 9e715722d74cd68653fcd3d5b05a979d522caff1 8c80bbc44df2062d9850b2b514c0a3c184d5bf9f sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a +hg 44571feeaa3be3ab239164829d0493249bb05582 307f733f9fc02f3a34aaaaffe19b3f04b5540c2b sub_hg_b /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo git e9a16bb7c08361f85ab0002e4094b4229fefb384 e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_b ok 12 - subcommand sub foreach @@ -4710,9 +4769,6 @@ test_cmp expected actual ) -HEAD is now at d2ba6d4 zero -HEAD is now at d2ba6d4 zero -HEAD is now at 78060f6 good branch ok 25 - remote big push force dry-run expecting success: @@ -4738,111 +4794,105 @@ test_expect_code 1 git push ) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...6439ad6 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...10e5d84 branches/good_branch -> branches/good_branch (forced update) - + fffffff...30facca bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...af8bcb3 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...9f0c97a good_bmark -> good_bmark (forced update) - + fffffff...275e90a master -> master (forced update) - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - + fffffff...275e90a master -> master (forced update) - + fffffff...9f0c97a good_bmark -> good_bmark (forced update) - + fffffff...10e5d84 branches/good_branch -> branches/good_branch (forced update) - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + fffffff...30facca bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...af8bcb3 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...6439ad6 branches/bad_branch -> branches/bad_branch (forced update) +ok 25 - remote big push force dry-run + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero && + echo one > content && + hg commit -m one + ) && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git reset --hard HEAD^ && + echo two > content && + git commit -a -m two && + test_expect_code 1 git push && + test_expect_code 1 git push + ) + Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 25e2ee132719:26af4d0fa53b +new changesets d62cab09c30c:7fc4184e2c75 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -HEAD is now at 634fdaf zero -[master 145435e] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets cc3158f4e6dd:85f2ec9687d9 +new changesets 351c445d9a64:36e1f87278f0 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +HEAD is now at 9e9b66f zero +[master cfac5ec] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Cloning into './sub_hg'... hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. If you want to integrate the remote changes, hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into './sub_hg'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +new changesets fa295a73fd44:b40dee346058 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets fdcf0ea5a880 +new changesets 249625bd2347 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -ok 25 - remote big push force dry-run - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero && - echo one > content && - hg commit -m one - ) && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git reset --hard HEAD^ && - echo two > content && - git commit -a -m two && - test_expect_code 1 git push && - test_expect_code 1 git push - ) - +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +HEAD is now at 082638d zero +[master fff7e56] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. If you want to integrate the remote changes, hint: use 'git pull' before pushing again. @@ -4879,6 +4929,16 @@ ) url = foobar +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses @@ -4947,51 +5007,9 @@ check_branch hgclone/sub_hg default one_sub_hg && check hgclone/sub_git HEAD one_sub_git -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets be9b9f40d66d:fbb8b6d90bb0 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... -HEAD is now at 10dbb55 zero -[master e5d2696] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -adding changesets -adding manifests -adding file changes -adding remote bookmark feature-a -added 2 changesets with 2 changes to 1 files -new changesets be9b9f40d66d:0520fc6fa210 -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ no changes found -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' @@ -5030,6 +5048,25 @@ ! grep feature-a out ) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +adding remote bookmark feature-a +added 2 changesets with 2 changes to 1 files +new changesets 30975a9dd4f8:9a28e05bc182 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -5082,23 +5119,6 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 736313390b17:58dd1072b11a -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into './sub_hg'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets @@ -5106,50 +5126,26 @@ adding file changes adding remote bookmark feature-a added 2 changesets with 2 changes to 1 files -new changesets 9ddd3fdebddb:63f47dbdc61b +new changesets b958cff04881:f4d0b7bf83fc progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets f928a9696c03 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -created new head -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/gitrepo/ -Cloning into './sub_git'... -done. -[detached HEAD 3a4ec54] one_sub_hg - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +added 2 changesets with 3 changes to 3 files +new changesets 6db41c2bfbf4:20fff4cb570d +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways no changes found error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - [deleted] (none) -> origin/feature-a -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets a3fc97121dd0:38f02f056d75 -WARNING: Branch 'default' has more than one head, consider merging -WARNING: Branch 'default' has more than one head, consider merging -progress revision 1 'default' (0/1) -From hg::../hgrepo - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] branches/default -> origin/branches/default - * [new branch] master -> origin/master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +0 files updated, 0 files merged, 1 files removed, 0 files unresolved ok 27 - fetch prune expecting success: @@ -5194,63 +5190,102 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Cloning into './sub_hg'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +created new head +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/gitrepo/ +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 7e153ddabb49 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files (+1 heads) +new changesets 462ae7b5f0e0:323a551d0a9d +WARNING: Branch 'default' has more than one head, consider merging +Cloning into './sub_git'... +done. +WARNING: Branch 'default' has more than one head, consider merging +progress revision 1 'default' (0/1) +From hg::../hgrepo + * [new branch] branches/default -> branches/default + * [new branch] master -> master + * [new branch] branches/default -> origin/branches/default + * [new branch] master -> origin/master +[detached HEAD edfd199] one_sub_hg + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +created new head no changes found +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/gitrepo/ searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - fffffff..3a4ec54 HEAD -> master -1 files updated, 0 files merged, 1 files removed, 0 files unresolved + fffffff..edfd199 HEAD -> master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files (+1 heads) +new changesets 90d5bbf133d3:53a62c07ddf5 +WARNING: Branch 'default' has more than one head, consider merging +WARNING: Branch 'default' has more than one head, consider merging +progress revision 1 'default' (0/1) +From hg::../hgrepo + * [new branch] branches/default -> branches/default + * [new branch] master -> master + * [new branch] branches/default -> origin/branches/default + * [new branch] master -> origin/master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -1 local changesets published -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - 4bc2839..3a4ec54 branches/default -> origin/branches/default -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -To /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git - * [new branch] HEAD -> new /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +no changes found +1 local changesets published +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg + de93104..edfd199 branches/default -> origin/branches/default searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets e74e4113e9b1 +new changesets 933edfc46328 WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'branches/default' (2/2) progress revision 0 'default' (0/2) -0 files updated, 0 files merged, 1 files removed, 0 files unresolved From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + 102811b...a888228 branches/default -> origin/branches/default (forced update) - + 102811b...a888228 master -> origin/master (forced update) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Updating ./sub_hg to 4d24a55d46f8f0ebbf440f834911db611cb32921 [git 3a4ec54] -Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] -diff --git a/.hgsubstate b/.hgsubstate -index 6727832..0a86041 100644 ---- a/.hgsubstate -+++ b/.hgsubstate -@@ -1,2 +1,2 @@ --e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git --f928a9696c03c23db6fc0a1e5b777f53976805be sub_hg -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git -+4d24a55d46f8f0ebbf440f834911db611cb32921 sub_hg - M .hgsubstate -[master 37ebe40] update_sub + + 0397001...b80943c branches/default -> origin/branches/default (forced update) + + 0397001...b80943c master -> origin/master (forced update) +[detached HEAD cea1af1] one_sub_git Author: A U Thor - 1 file changed, 2 insertions(+), 2 deletions(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + 1 file changed, 1 insertion(+), 1 deletion(-) +To /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git + * [new branch] HEAD -> new +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] ok 28 - fetch multiple independent histories @@ -5278,16 +5313,47 @@ git push origin bookmark ) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Updating ./sub_hg to 79ca2cefd85f8c325ba7fd2cf44d1c15fa491db3 [git edfd199] +Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] +diff --git a/.hgsubstate b/.hgsubstate +index 8914ba4..193f727 100644 +--- a/.hgsubstate ++++ b/.hgsubstate +@@ -1,2 +1,2 @@ +-e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git +-7e153ddabb49251db88487f0b2fe65a16df8cb06 sub_hg ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git ++79ca2cefd85f8c325ba7fd2cf44d1c15fa491db3 sub_hg + M .hgsubstate +[master 4204e03] update_sub + Author: A U Thor + 1 file changed, 2 insertions(+), 2 deletions(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 791365f58cd9 +WARNING: Branch 'default' has more than one head, consider merging no changes found +progress revision walk 'branches/default' (2/2) +progress revision 0 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + + d50be8d...679e2a4 branches/default -> origin/branches/default (forced update) + + d50be8d...679e2a4 master -> origin/master (forced update) searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - fffffff..37ebe40 master -> master -created new head -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/gitrepo/ + fffffff..4204e03 master -> master Cloning into '/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgclone/sub_git'... done. Switched to a new branch 'new' @@ -5295,24 +5361,34 @@ cloning subrepo sub_git from /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git cloning subrepo sub_hg from /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg 3 files updated, 0 files merged, 0 files removed, 0 files unresolved -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets 0368dccdac79:ff9b8f38bb4d -WARNING: Branch 'default' has more than one head, consider merging -WARNING: Branch 'default' has more than one head, consider merging -progress revision 1 'default' (0/1) -From hg::../hgrepo - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] branches/default -> origin/branches/default - * [new branch] master -> origin/master -0 files updated, 0 files merged, 0 files removed, 0 files unresolved +ok 28 - fetch multiple independent histories + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo a > a && + hg add a && + hg commit -m a && + hg bookmark -r null bookmark + ) && + + ( + git clone "hg::hgrepo" gitrepo && + check gitrepo HEAD a && + cd gitrepo && + git checkout --quiet -b bookmark && + git remote -v && + echo b > b && + git add b && + git commit -m b && + git push origin bookmark + ) + Cloning into 'gitrepo'... -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +0 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -5322,16 +5398,20 @@ adding file changes adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -new changesets 1d5dd321e9d9 +new changesets b4bfb2d6419c WARNING: Ignoring invalid bookmark 'bookmark' progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (fetch) origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (push) -[bookmark 7f43db0] b +[bookmark 18743e2] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways ok 14 - subcommand sub addstate expecting success: @@ -5376,24 +5456,6 @@ test_cmp output actual ) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets da72be6a87c3 -WARNING: Branch 'default' has more than one head, consider merging -progress revision walk 'branches/default' (2/2) -progress revision 0 'default' (0/2) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + 7c222fc...820bbee branches/default -> origin/branches/default (forced update) - + 7c222fc...820bbee master -> origin/master (forced update) no changes found WARNING: Ignoring invalid bookmark 'bookmark' searching for changes @@ -5423,34 +5485,56 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -ok 28 - fetch multiple independent histories +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +adding remote bookmark bookmark +added 1 changesets with 1 changes to 1 files +new changesets 87cfbfb2273c +WARNING: Ignoring invalid bookmark 'bookmark' +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (fetch) +origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (push) +[bookmark 4740fd5] b + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 b +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +WARNING: Ignoring invalid bookmark 'bookmark' +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new branch] bookmark -> bookmark +ok 29 - clone remote with null bookmark, then push expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && + test_when_finished "rm -rf hgrepo gitrepo" && ( hg init hgrepo && cd hgrepo && - echo a > a && - hg add a && - hg commit -m a && - hg bookmark -r null bookmark + echo one > content && + hg add content && + hg commit -m one && + echo two > content && + hg commit -m two ) && - ( git clone "hg::hgrepo" gitrepo && - check gitrepo HEAD a && - cd gitrepo && - git checkout --quiet -b bookmark && - git remote -v && - echo b > b && - git add b && - git commit -m b && - git push origin bookmark - ) + hg -R hgrepo log --template "{node}\n\n" > expected && + git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && + test_cmp expected actual Cloning into 'gitrepo'... -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -5459,31 +5543,9 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets e4a4d2dd1b7b:609863ce644b +new changesets 188dfdefb9ee:7de308cfd969 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git -adding changesets -adding manifests -adding file changes -adding remote bookmark bookmark -added 1 changesets with 1 changes to 1 files -new changesets 5e0110b559dd -WARNING: Ignoring invalid bookmark 'bookmark' -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (fetch) -origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (push) -[bookmark e2704c5] b - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 b ok 30 - notes checking known breakage: @@ -5510,19 +5572,23 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... -no changes found -WARNING: Ignoring invalid bookmark 'bookmark' -searching for changes +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new branch] bookmark -> bookmark -ok 29 - clone remote with null bookmark, then push +added 2 changesets with 2 changes to 1 files +new changesets 0c413eaeba5e:097c534f0f4d +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... +ok 30 - notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -5532,64 +5598,44 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one && - echo two > content && - hg commit -m two + hg commit -m one ) && git clone "hg::hgrepo" gitrepo && + + ( + cd gitrepo && + echo two > content && + git commit -a -m two && + git push + ) && + hg -R hgrepo log --template "{node}\n\n" > expected && git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets e6b623e11c5a:5b7538d91530 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -Cloning into 'gitrepo'... -new changesets 491e455ff699 +new changesets 685781e2622f progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 728d8b6] two +Cloning into 'gitrepo'... +[master 9ea935e] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets c9fa80456ca4 -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 491e455ff699:e3c92eb2e498 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 2 changesets with 3 changes to 3 files +new changesets 4a029d7c57c8:1621631c9284 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -5603,47 +5649,21 @@ adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - c638904..728d8b6 master -> master -ok 30 - notes - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && - - ( - hg init hgrepo && - cd hgrepo && - echo one > content && - hg add content && - hg commit -m one - ) && - - git clone "hg::hgrepo" gitrepo && - - ( - cd gitrepo && - echo two > content && - git commit -a -m two && - git push - ) && - - hg -R hgrepo log --template "{node}\n\n" > expected && - git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && - test_cmp expected actual - + 1ac2ae7..9ea935e master -> master +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into './sub_git'... -done. ---- expected 2025-06-07 18:42:48.472319017 +0000 -+++ actual 2025-06-07 18:42:48.728319017 +0000 +Cloning into './sub_hg_a'... +--- expected 2024-05-05 12:24:58.454363286 +0000 ++++ actual 2024-05-05 12:24:58.542363785 +0000 @@ -1,4 +1,3 @@ --f25202b24b8d60df4cf8d006537c4500ba399411 +-ed203060df6b4db623a903dabbacf8c086318e9d - 491e455ff6999d6ffbabfafcfaf59957abec14e5 + 685781e2622f51e3f3fb1c717b1e4e0899dbde36 not ok 31 - push updates notes # TODO known breakage @@ -5671,60 +5691,29 @@ check_bookmark hgrepo feature-a two -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into 'gitrepo'... - 392fc1252ed0782629c9a425d4aa6ce30dbfd629 ./sub_hg_a (heads/master) --8cb414f43f7c8e5e90af635b29115930fcb47a03[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) - 392fc1252ed0782629c9a425d4aa6ce30dbfd629 ./sub_hg_a (heads/master) --8cb414f43f7c8e5e90af635b29115930fcb47a03[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets a02a4fa611e6 +new changesets bc4e6eb8004b progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -[master 070920b] two +[master bdbe0f0] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) -ok 15 - subcommand sub status - -# passed all 15 test(s) -1..15 adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets c6b63f3cf665 +new changesets 3b580c23fb60 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -[master 932984f] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) no changes found searching for changes adding changesets @@ -5732,19 +5721,19 @@ adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..070920b master -> master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + fffffff..bdbe0f0 master -> master +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 5240e58..932984f master -> master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Cloning into './sub_git'... +done. +[detached HEAD cea1af1] one_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) ok 31 - push updates notes expecting success: @@ -5775,12 +5764,71 @@ or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 19f7c1c6cd0c +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master c6b9ff0] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp + 75f5073f4ac43b94227f7ed11613799755ee8acd ./sub_hg_a (heads/master) +-5508fc96b1350db38d7abb79967c93220b1d0672[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) + 75f5073f4ac43b94227f7ed11613799755ee8acd ./sub_hg_a (heads/master) +-5508fc96b1350db38d7abb79967c93220b1d0672[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 0850c05..c6b9ff0 master -> master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) +ok 15 - subcommand sub status + +# passed all 15 test(s) +1..15 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] no changes found 1 local changesets published searching for changes To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new branch] feature-a -> feature-a -Cloning into 'gitrepo'... +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 189686213688 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master aee5fb6] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) ok 32 - push bookmark without changesets expecting success: @@ -5805,19 +5853,6 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets a6680800bc28 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master 4dfce6d] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] no changes found searching for changes adding changesets @@ -5825,18 +5860,7 @@ adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..4dfce6d master -> master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 95eada320629 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) + fffffff..aee5fb6 master -> master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found @@ -5844,21 +5868,7 @@ searching for changes To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo * [new branch] feature-a -> feature-a -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets fcd9d02968cc -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 9c1e177..c7f148d master -> origin/master - 9c1e177..c7f148d branches/default -> origin/branches/default - * [new tag] v1.0 -> v1.0 +Cloning into 'gitrepo'... ok 32 - push bookmark without changesets expecting success: @@ -5881,7 +5891,34 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual -Updating 9c1e177..c7f148d +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 700a34513097 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 5e78a2f6cde5 +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 0493dd6..1faf052 master -> origin/master + 0493dd6..1faf052 branches/default -> origin/branches/default + * [new tag] v1.0 -> v1.0 +Updating 0493dd6..1faf052 Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -5921,18 +5958,15 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 6f84c6d9e60e +new changesets f4570dd58e0d progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] searching for changes @@ -5940,14 +5974,13 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 985b781478ba -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +new changesets f34fa1616e67 progress revision 1 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 8baa8dc..6465dda master -> origin/master - 8baa8dc..6465dda branches/default -> origin/branches/default + 23a103b..59c4db7 master -> origin/master + 23a103b..59c4db7 branches/default -> origin/branches/default * [new tag] v1.0 -> v1.0 -Updating 8baa8dc..6465dda +Updating 23a103b..59c4db7 Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -5987,6 +6020,11 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] @@ -5996,16 +6034,15 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 470d543da355:c881a54dca23 +new changesets c19f44e7a90a:e6530bce080b progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved Auto-merging content Merge made by the 'ort' strategy. content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -6017,8 +6054,18 @@ adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 109adc4..4444fbe master -> master -1 files updated, 0 files merged, 0 files removed, 0 files unresolved + 38c5cf4..47ec2ae master -> master +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets 217ecd92fcc3:748fa5703d0c +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'feature' (0/1) ok 34 - push merged named branch expecting success: @@ -6043,33 +6090,10 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 0156dd81b97d:0b74266138f5 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'feature' (0/1) Auto-merging content Merge made by the 'ort' strategy. content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 24adbf29c81b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found @@ -6079,19 +6103,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..06467c6 master -> master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new tag] v1.0 -> v1.0 + fffffff..ef924af master -> master ok 34 - push merged named branch expecting success: @@ -6116,6 +6128,40 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets e450b76640b3 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new tag] v1.0 -> v1.0 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 2e69df871653 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 35 - light tag sets author expecting success: @@ -6145,18 +6191,6 @@ hg -R hgrepo log --template="{branch}\n" -r tip > actual && test_cmp expected actual -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 3e1811daa952 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found @@ -6167,7 +6201,6 @@ added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo * [new tag] v1.0 -> v1.0 -Cloning into 'gitrepo'... ok 35 - light tag sets author expecting success: @@ -6197,6 +6230,9 @@ hg -R hgrepo log --template="{branch}\n" -r tip > actual && test_cmp expected actual +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -6205,7 +6241,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 7440b4cde422:eae772337db0 +new changesets 2a41f3cdb130:89e014d8a4f3 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'feature' (0/1) @@ -6233,7 +6269,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 7607edf8ad03:466429fc308f +new changesets 2d608c6f61d4:faebd08793d2 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'feature' (0/1) @@ -6299,7 +6335,7 @@ adding manifests adding file changes added 2 changesets with 1 changes to 1 files -new changesets cbe14e9a7a95:5de64ba63176 +new changesets 1734c8fe3372:94ee49210993 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 37 - cloning a removed file works @@ -6332,7 +6368,7 @@ adding manifests adding file changes added 2 changesets with 1 changes to 1 files -new changesets ce0003776e1f:e917b92a7b23 +new changesets 8d1e0cc91626:f22013b24725 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 37 - cloning a removed file works @@ -6367,10 +6403,9 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 752782e96ca2:20181994e5fb +new changesets acfdfc8bbb70:8517a9e8fd81 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... ok 38 - cloning a file replaced with a directory expecting success: @@ -6396,13 +6431,14 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file" +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets e0f0aa4946d5:a90aaca1f1da +new changesets 8365c824a160:5107fc6d2880 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 38 - cloning a file replaced with a directory @@ -6439,10 +6475,9 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 562f7e615ef7:380fb93d89cf +new changesets 44d0cf2099cf:574a33fad43a progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... ok 39 - clone replace directory with a file expecting success: @@ -6466,13 +6501,14 @@ git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && check_files gitrepo "test.txt" +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets a90403fcb00d:45ca1beb2518 +new changesets 3596128df21f:89add31ae335 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 39 - clone replace directory with a file @@ -6500,11 +6536,9 @@ marked working directory as branch parent (branches are permanent and global, did you want a bookmark?) +marked working directory as branch parent/child marked working directory as branch parent (branches are permanent and global, did you want a bookmark?) -marked working directory as branch parent/child -marked working directory as branch parent/child -Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] @@ -6514,18 +6548,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -new changesets d66587bf3992:3553ac514437 -WARNING: Ignoring matched branch parent/child -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'parent' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files -new changesets 888e3cf86db2:817b5f48c2be +new changesets 2dc5a0418d1c:967454bf239b WARNING: Ignoring matched branch parent/child progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) @@ -6559,6 +6582,20 @@ test_cmp expected actual +marked working directory as branch parent/child +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 3 changesets with 3 changes to 1 files +new changesets d47ea0d80245:cdb6e69cf813 +WARNING: Ignoring matched branch parent/child +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'parent' (0/1) +Cloning into 'gitrepo'... ok 40 - clone can ignore invalid refnames expecting success: @@ -6588,34 +6625,21 @@ test_cmp expected actual -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets ba2f5b4a1eb1 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 837e2f056072 +new changesets 0ff7b7c3fad6 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] no changes found searching for changes adding changesets @@ -6624,14 +6648,9 @@ added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new tag] v1.0 -> v1.0 -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new tag] v1.0 -> v1.0 +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 41 - push annotated tag expecting success: @@ -6654,6 +6673,35 @@ git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && test_cmp expected actual +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets aef94d32e8f5 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into 'gitrepo1'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new tag] v1.0 -> v1.0 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +warning: You appear to have cloned an empty repository. +[master (root-commit) 9f40cc0] two + Author: A U Thor + Date: Mon Sep 26 00:00:00 2016 -0230 + 1 file changed, 1 insertion(+) + create mode 100644 content ok 41 - push annotated tag expecting success: @@ -6676,35 +6724,48 @@ git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && test_cmp expected actual -Cloning into 'gitrepo1'... -Cloning into 'gitrepo1'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new branch] master -> master +Cloning into 'gitrepo1'... +Cloning into 'gitrepo2'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets e522f351d13b +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) no changes found -no changes found -warning: You appear to have cloned an empty repository. warning: You appear to have cloned an empty repository. [master (root-commit) 9f40cc0] two Author: A U Thor Date: Mon Sep 26 00:00:00 2016 -0230 1 file changed, 1 insertion(+) create mode 100644 content -[master (root-commit) 9f40cc0] two - Author: A U Thor - Date: Mon Sep 26 00:00:00 2016 -0230 - 1 file changed, 1 insertion(+) - create mode 100644 content +ok 42 - timezone issues with negative offsets + +# still have 2 known breakage(s) +# passed all remaining 40 test(s) +1..42 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] no changes found -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways searching for changes adding changesets adding manifests @@ -6712,20 +6773,7 @@ added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo * [new branch] master -> master -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new branch] master -> master -Cloning into 'gitrepo2'... Cloning into 'gitrepo2'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets @@ -6735,18 +6783,6 @@ new changesets e522f351d13b progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets e522f351d13b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -ok 42 - timezone issues with negative offsets - -# still have 2 known breakage(s) -# passed all remaining 40 test(s) -1..42 ok 42 - timezone issues with negative offsets expecting success: @@ -6779,7 +6815,7 @@ adding file changes adding remote bookmark feature-a added 1 changesets with 1 changes to 1 files -new changesets 1bedec0e3df3 +new changesets 5f0e42f2a79c progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -6826,10 +6862,10 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 7b88c8b45e7d +new changesets c183e57d8615 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 5b35ea8] one +[master a7cb7ec] one Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -6875,7 +6911,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 7ea83e32487b +new changesets b3cc2e73437d progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -6895,21 +6931,21 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets e2fdb88ddcbd:174c844aa776 +new changesets a17b34ad519a:3dfcead7345a progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 6fd9200..52b9ce2 master -> origin/master - 6fd9200..52b9ce2 branches/default -> origin/branches/default -HEAD is now at 52b9ce2 restored + c13043d..55b15de master -> origin/master + c13043d..55b15de branches/default -> origin/branches/default +HEAD is now at 55b15de restored /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:1613: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - ! [remote rejected] master -> master (rejected not pushing hg based commit 2dbb6274a9e180b337ba7131677d0809b166c735) + ! [remote rejected] master -> master (rejected not pushing hg based commit 9c4ba91a18b4423cb214da93a656907ffb352b8e) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second' - ! [remote rejected] master -> master (rejected not pushing hg based commit 2dbb6274a9e180b337ba7131677d0809b166c735) + ! [remote rejected] master -> master (rejected not pushing hg based commit 9c4ba91a18b4423cb214da93a656907ffb352b8e) ok 45 - check-hg-commits with fail mode expecting success: @@ -6933,25 +6969,25 @@ or locale.getdefaultlocale()[1] progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 24dca26..243facc master -> origin/master - 24dca26..243facc branches/default -> origin/branches/default -HEAD is now at 243facc restored + f55222b..a2ad141 master -> origin/master + f55222b..a2ad141 branches/default -> origin/branches/default +HEAD is now at a2ad141 restored /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:1613: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -WARNING: Pushing hg changeset 58c2e65cfc91d9b51a5cc6bfedebdebb9a8c3de2 for 5a7a2125ab988a32e47b217d52c484075de55436 -WARNING: Pushing hg changeset ecdab2bc3d9e34de0f1fc0d4de59a833528aa807 for cde6c5957a86f2556610befc0173169e3794c297 -WARNING: Pushing hg changeset 55276b5db7b979675467e76984b7d1b7b338d7f8 for 82032cf4aacc170bd85d354a451f0bb1938faf62 -WARNING: Pushing hg changeset 3ee8b76bb0e88406d7ce686cdc65929c96df9d67 for bf493f43d99022a9319246e49965b365ba863476 -WARNING: Pushing hg changeset 1f71c9047ef65e6c93fa6b49fb9d34bac598dd25 for 243facc5106bee0669cad6e4216ce3558958d413 +WARNING: Pushing hg changeset 828eb4d7d4b4e32a141e47048275699c5847e838 for 3e4fa136b93d2d5b0264a39d5bed47c1f928e853 +WARNING: Pushing hg changeset c309ee899e069cbaf574264d8d1acac2830a0850 for e4fb0ae6d98b3aba75cac4b681a10f1536ad28cc +WARNING: Pushing hg changeset ad8abd85859af1b0ca8d97c8474d7c282a9e2480 for 13727a14a68c25ac3d75e81b39ea593196cd5c19 +WARNING: Pushing hg changeset f0bf3faa5d3416f338bbfeff1297bd62caf6ae92 for b96f3ebab12dc0b9a7704e8da144be7d48099b79 +WARNING: Pushing hg changeset ec0c1cef303b30a3d95b07c33ecbec6459236367 for a2ad141189cf27c1da3f69544a60d2faa223ac93 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..243facc master -> master -WARNING: Pushing hg changeset 58c2e65cfc91d9b51a5cc6bfedebdebb9a8c3de2 for 5a7a2125ab988a32e47b217d52c484075de55436 -WARNING: Pushing hg changeset ecdab2bc3d9e34de0f1fc0d4de59a833528aa807 for cde6c5957a86f2556610befc0173169e3794c297 -WARNING: Pushing hg changeset 55276b5db7b979675467e76984b7d1b7b338d7f8 for 82032cf4aacc170bd85d354a451f0bb1938faf62 -WARNING: Pushing hg changeset 3ee8b76bb0e88406d7ce686cdc65929c96df9d67 for bf493f43d99022a9319246e49965b365ba863476 -WARNING: Pushing hg changeset 1f71c9047ef65e6c93fa6b49fb9d34bac598dd25 for 243facc5106bee0669cad6e4216ce3558958d413 + fffffff..a2ad141 master -> master +WARNING: Pushing hg changeset 828eb4d7d4b4e32a141e47048275699c5847e838 for 3e4fa136b93d2d5b0264a39d5bed47c1f928e853 +WARNING: Pushing hg changeset c309ee899e069cbaf574264d8d1acac2830a0850 for e4fb0ae6d98b3aba75cac4b681a10f1536ad28cc +WARNING: Pushing hg changeset ad8abd85859af1b0ca8d97c8474d7c282a9e2480 for 13727a14a68c25ac3d75e81b39ea593196cd5c19 +WARNING: Pushing hg changeset f0bf3faa5d3416f338bbfeff1297bd62caf6ae92 for b96f3ebab12dc0b9a7704e8da144be7d48099b79 +WARNING: Pushing hg changeset ec0c1cef303b30a3d95b07c33ecbec6459236367 for a2ad141189cf27c1da3f69544a60d2faa223ac93 ok 46 - check-hg-commits with push mode - no local proxy expecting success: @@ -6964,7 +7000,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 2022abbded0e +new changesets 4cc034acb29f progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -6984,34 +7020,34 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets 9e10a6f5d3f6:ef48aa171d53 +new changesets a763ed03641d:635913cb58d8 progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 84ce8dd..c2db83a master -> origin/master - 84ce8dd..c2db83a branches/default -> origin/branches/default -HEAD is now at c2db83a restored + 9eb3682..4b19af9 master -> origin/master + 9eb3682..4b19af9 branches/default -> origin/branches/default +HEAD is now at 4b19af9 restored /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:1613: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -WARNING: Using hg changeset 9e10a6f5d3f682f3b382b4494857ed44284a5ef4 for b7201e4f12e326872c0c58cfc09d7ff65e95d0fd -WARNING: Using hg changeset f28db0f0f205ed50d7c95bbe4dc1d955b054194d for 02a0547684dc876e23eb9beb5388c1af1f9f1226 -WARNING: Using hg changeset fa3b04e1cc55b3ec58321db513893597f86af75a for e00c33bcb992442be5ed32a881a18a084626d537 -WARNING: Using hg changeset 73e62bf61c11e66607fe4b254f3132778c60e0e6 for 54791f88cc4ed08b8ff0d5753160f716234582a8 -WARNING: Using hg changeset ef48aa171d53fd8688e886671eeda0ade275941b for c2db83a2456980922da13ab975ed801b282cadb7 +WARNING: Using hg changeset a763ed03641d096d88c2be5788a3b04633baedcb for 7e535d6cfaca0af810bae09ef0f5b644c9b40565 +WARNING: Using hg changeset 403dbe0f6e33626390a6516449332f3e99c6adcf for ce3c85b0c47cb6f688b41e56a878fd5a23064d0f +WARNING: Using hg changeset a9f59d4806af7fecbc30af7cf49ec59d4d4b809f for 651b4ca76143026664b2832c15ca1a1aec6c49ea +WARNING: Using hg changeset 909ade24ca98eda3c50fce52ea59dbc4cdfcd459 for 19f1715ec529b28b20297769a33793c1fb8d5d04 +WARNING: Using hg changeset 635913cb58d8bc63b1b1c73082559dd461e4d2a1 for 4b19af9a941b1eb202995af5dd258942c0b06db3 searching for changes adding changesets adding manifests adding file changes added 5 changesets with 5 changes to 2 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..c2db83a master -> master -WARNING: Using hg changeset 9e10a6f5d3f682f3b382b4494857ed44284a5ef4 for b7201e4f12e326872c0c58cfc09d7ff65e95d0fd -WARNING: Using hg changeset f28db0f0f205ed50d7c95bbe4dc1d955b054194d for 02a0547684dc876e23eb9beb5388c1af1f9f1226 -WARNING: Using hg changeset fa3b04e1cc55b3ec58321db513893597f86af75a for e00c33bcb992442be5ed32a881a18a084626d537 -WARNING: Using hg changeset 73e62bf61c11e66607fe4b254f3132778c60e0e6 for 54791f88cc4ed08b8ff0d5753160f716234582a8 -WARNING: Using hg changeset ef48aa171d53fd8688e886671eeda0ade275941b for c2db83a2456980922da13ab975ed801b282cadb7 + fffffff..4b19af9 master -> master +WARNING: Using hg changeset a763ed03641d096d88c2be5788a3b04633baedcb for 7e535d6cfaca0af810bae09ef0f5b644c9b40565 +WARNING: Using hg changeset 403dbe0f6e33626390a6516449332f3e99c6adcf for ce3c85b0c47cb6f688b41e56a878fd5a23064d0f +WARNING: Using hg changeset a9f59d4806af7fecbc30af7cf49ec59d4d4b809f for 651b4ca76143026664b2832c15ca1a1aec6c49ea +WARNING: Using hg changeset 909ade24ca98eda3c50fce52ea59dbc4cdfcd459 for 19f1715ec529b28b20297769a33793c1fb8d5d04 +WARNING: Using hg changeset 635913cb58d8bc63b1b1c73082559dd461e4d2a1 for 4b19af9a941b1eb202995af5dd258942c0b06db3 ok 47 - check-hg-commits with push mode - with local proxy expecting success: @@ -7033,7 +7069,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 4316ec118d29 +new changesets 041edd73874d progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -7043,23 +7079,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Jun 7 18:45 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 7 18:45 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 7 18:45 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 May 5 12:26 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 5 12:26 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 5 12:26 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 7 18:45 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 May 5 12:26 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 7 18:45 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 May 5 12:26 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 refs ok 48 - shared-marks unset expecting success: @@ -7091,7 +7127,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets ab20a8260c00 +new changesets e055cbbfd7fb progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -7101,23 +7137,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Jun 7 18:45 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 7 18:45 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 7 18:45 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 May 5 12:26 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 5 12:26 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 5 12:26 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 7 18:45 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 May 5 12:26 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 7 18:45 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 May 5 12:26 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 refs /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: seeded marks of second with shared; performing gc @@ -7143,25 +7179,25 @@ progress revision walk 'branches/default' (0/0) progress revision 0 'default' (0/1) total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 7 18:45 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Jun 7 18:45 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 7 18:45 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 7 18:45 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 May 5 12:26 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 May 5 12:26 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 May 5 12:26 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 May 5 12:26 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 7 18:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 7 18:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 7 18:45 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 7 18:45 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 7 18:45 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 May 5 12:26 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 May 5 12:26 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 May 5 12:26 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 5 12:26 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 5 12:26 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 7 18:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 7 18:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 7 18:45 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 7 18:45 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 7 18:45 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 May 5 12:26 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 May 5 12:26 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 May 5 12:26 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 5 12:26 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 5 12:26 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 refs ok 49 - shared-marks set to unset expecting success: @@ -7202,7 +7238,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 248ceb815e0b +new changesets 0d02afe7db17 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -7214,70 +7250,70 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 7 18:45 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Jun 7 18:45 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 7 18:45 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 7 18:45 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 May 5 12:26 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 May 5 12:26 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 May 5 12:26 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 May 5 12:26 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 7 18:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 7 18:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 7 18:45 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 7 18:45 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 7 18:45 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 May 5 12:26 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 May 5 12:26 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 May 5 12:26 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 5 12:26 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 5 12:26 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 7 18:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 7 18:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 7 18:45 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 7 18:45 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 7 18:45 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 May 5 12:26 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 May 5 12:26 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 May 5 12:26 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 5 12:26 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 5 12:26 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 refs /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 7 18:45 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Jun 7 18:45 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 7 18:45 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 7 18:45 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 May 5 12:26 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 May 5 12:26 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 May 5 12:26 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 May 5 12:26 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 7 18:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 7 18:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 7 18:45 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 7 18:45 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 7 18:45 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 May 5 12:26 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 May 5 12:26 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 May 5 12:26 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 5 12:26 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 5 12:26 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 7 18:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 7 18:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 7 18:45 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 7 18:45 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 7 18:45 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 May 5 12:26 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 May 5 12:26 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 May 5 12:26 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 5 12:26 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 5 12:26 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 refs /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: using marks of remote origin as shared marks no changes found total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Jun 7 18:45 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 7 18:45 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 7 18:45 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 May 5 12:26 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 5 12:26 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 5 12:26 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 7 18:45 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 May 5 12:26 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 7 18:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 7 18:45 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 7 18:45 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 May 5 12:26 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 May 5 12:26 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 May 5 12:26 refs ok 50 - shared-marks unset to set expecting success: @@ -7328,7 +7364,7 @@ To hg::../hgrepo * [new branch] master -> master 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Access: (0777/-rwxrwxrwx) Uid: ( 1111/pbuilder1) Gid: ( 1111/pbuilder1) +Access: (0777/-rwxrwxrwx) Uid: ( 2222/pbuilder2) Gid: ( 2222/pbuilder2) ok 51 - push with renamed executable preserves executable bit expecting success: @@ -7453,12 +7489,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: including full source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/3582234/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/3582234/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/66446 and its subdirectories -I: Current time: Sat Jun 7 06:45:30 -12 2025 -I: pbuilder-time-stamp: 1749321930 +I: removing directory /srv/workspace/pbuilder/3582234 and its subdirectories +I: Current time: Mon May 6 02:26:12 +14 2024 +I: pbuilder-time-stamp: 1714911972