Diff of the two buildlogs: -- --- b1/build.log 2025-09-27 15:22:09.980816910 +0000 +++ b2/build.log 2025-09-27 15:35:34.809818947 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Fri Oct 30 09:33:05 -12 2026 -I: pbuilder-time-stamp: 1793395985 +I: Current time: Sun Sep 28 05:22:12 +14 2025 +I: pbuilder-time-stamp: 1758986532 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/forky-reproducible-base.tgz] I: copying local configuration @@ -24,53 +24,85 @@ dpkg-source: info: applying 1001_testsuite_UTF-8.patch I: using fakeroot in build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/17129/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/1268617/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 Sep 27 15: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/1268617/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/1268617/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]="3" [2]="3" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu") + BASH_VERSION='5.3.3(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='forky' - HOME='/root' - HOST_ARCH='arm64' + DIRSTACK=() + DISTRIBUTION=forky + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=aarch64 + HOST_ARCH=arm64 IFS=' ' - INVOCATION_ID='4485a8f02d6240759ce530cbfd19ae0a' - 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='17129' - PS1='# ' - PS2='> ' + INVOCATION_ID=0272e54394964ee397b3ef206b627144 + 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=1268617 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.YnKLy59K/pbuilderrc_4xZM --distribution forky --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/forky-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.YnKLy59K/b1 --logfile b1/build.log git-remote-hg_1.0.5~ds-1.dsc' - SUDO_GID='109' - SUDO_HOME='/var/lib/jenkins' - 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.YnKLy59K/pbuilderrc_HLIE --distribution forky --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/forky-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.YnKLy59K/b2 --logfile b2/build.log git-remote-hg_1.0.5~ds-1.dsc' + SUDO_GID=109 + SUDO_HOME=/var/lib/jenkins + 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.12.48+deb13-cloud-arm64 #1 SMP Debian 6.12.48-1 (2025-09-20) aarch64 GNU/Linux + Linux i-capture-the-hostname 6.12.48+deb13-cloud-arm64 #1 SMP Debian 6.12.48-1 (2025-09-20) aarch64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Aug 10 2025 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/17129/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Aug 10 12:30 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/1268617/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -235,7 +267,7 @@ Get: 109 http://deb.debian.org/debian forky/main arm64 sharness all 1.0.0-1.1 [28.6 kB] Get: 110 http://deb.debian.org/debian forky/main arm64 xsltproc arm64 1.1.43-0.2 [43.5 kB] Get: 111 http://deb.debian.org/debian forky/main arm64 xmlto arm64 0.0.29-2 [27.3 kB] -Fetched 49.8 MB in 0s (126 MB/s) +Fetched 49.8 MB in 1s (74.3 MB/s) Preconfiguring packages ... Selecting previously unselected package libexpat1:arm64. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 20020 files and directories currently installed.) @@ -609,8 +641,8 @@ Setting up tzdata (2025b-5) ... Current default time zone: 'Etc/UTC' -Local time is now: Fri Oct 30 21:33:45 UTC 2026. -Universal Time is now: Fri Oct 30 21:33:45 UTC 2026. +Local time is now: Sat Sep 27 15:23:01 UTC 2025. +Universal Time is now: Sat Sep 27 15:23:01 UTC 2025. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17030-1) ... @@ -725,7 +757,11 @@ fakeroot is already the newest version (1.37.1.2-1). 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. I: Building the package -I: Running cd /build/reproducible-path/git-remote-hg-1.0.5~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.5~ds-1_source.changes +I: user script /srv/workspace/pbuilder/1268617/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for forky +I: user script /srv/workspace/pbuilder/1268617/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/reproducible-path/git-remote-hg-1.0.5~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.5~ds-1_source.changes dpkg-buildpackage: info: source package git-remote-hg dpkg-buildpackage: info: source version 1.0.5~ds-1 dpkg-buildpackage: info: source distribution unstable @@ -780,6 +816,15 @@ ./bidi.t --verbose ./helper.t --verbose expecting success: + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) + +expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && setup_repos && @@ -801,15 +846,6 @@ ) expecting success: - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - ) - -expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && ( @@ -864,12 +900,6 @@ /build/reproducible-path/git-remote-hg-1.0.5~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 -Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 4 files ok 1 - setup expecting success: @@ -878,8 +908,11 @@ check gitrepo HEAD zero Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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 4 changesets with 4 changes to 4 files ok 1 - setup expecting success: @@ -888,31 +921,34 @@ check gitrepo HEAD zero Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 44adeeb264f7 +new changesets ae2798a60523 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 ed36542f9696 -/build/reproducible-path/git-remote-hg-1.0.5~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] +new changesets ae2798a60523 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/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 ed36542f9696 +new changesets ae2798a60523 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 2 - cloning @@ -930,8 +966,6 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/branches/next next -/build/reproducible-path/git-remote-hg-1.0.5~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 2 - cloning expecting success: @@ -947,13 +981,17 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/branches/next next +/build/reproducible-path/git-remote-hg-1.0.5~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] +marked working directory as branch next +(branches are permanent and global, did you want a bookmark?) +marked working directory as branch next +(branches are permanent and global, did you want a bookmark?) adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 4 files new changesets 1e3e49d2cc8f:6674f1c866b5 -marked working directory as branch next -(branches are permanent and global, did you want a bookmark?) progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) origin @@ -976,32 +1014,39 @@ test_cmp expected actual -marked working directory as branch next -(branches are permanent and global, did you want a bookmark?) Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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 /build/reproducible-path/git-remote-hg-1.0.5~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 4 changesets with 4 changes to 4 files +added 2 changesets with 2 changes to 1 files +new changesets ae2798a60523:4f7add092b02 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'next' (0/1) +/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 adding manifests adding file changes -Cloning into 'gitrepo'... added 2 changesets with 2 changes to 1 files -new changesets ed36542f9696:f161fe1c8c1b +new changesets ae2798a60523:4f7add092b02 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~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] +searching for changes +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 4 changes to 4 files ok 3 - cloning with branches expecting success: @@ -1018,21 +1063,6 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/feature-a feature-a -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 ed36542f9696:f161fe1c8c1b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'next' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~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] -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) ok 3 - cloning with branches expecting success: @@ -1050,25 +1080,16 @@ check gitrepo origin/feature-a feature-a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Cloning into 'gitrepo'... +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.5~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) +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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 2 - subcommand repo - no local proxy - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repos && - - ( - cd gitrepo && - export gitdir=`git rev-parse --git-dir` - # trick to normalize path - ( cd $gitdir/hg/origin/clone && pwd ) >../expected && - ( cd `git-hg-helper repo origin` && pwd ) > ../actual - ) && - - test_cmp expected actual - ok 1 - encoding expecting success: @@ -1124,19 +1145,38 @@ Author: A U Thor 1 file changed, 1 deletion(-) delete mode 100644 foo/bar -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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 2 - subcommand repo - no local proxy + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repos && + + ( + cd gitrepo && + export gitdir=`git rev-parse --git-dir` + # trick to normalize path + ( cd $gitdir/hg/origin/clone && pwd ) >../expected && + ( cd `git-hg-helper repo origin` && pwd ) > ../actual + ) && + + test_cmp expected actual + 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 ed36542f9696:7236e7028cca +new changesets ae2798a60523:ea7bf5eab0bd 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.5~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 4 - cloning with bookmarks expecting success: @@ -1158,28 +1198,15 @@ check_bookmark hgrepo devel devel -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 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 ed36542f9696:7236e7028cca -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files +new changesets ae2798a60523:ea7bf5eab0bd 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: @@ -1202,59 +1229,75 @@ check_bookmark hgrepo devel devel Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~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 Cloning into 'gitrepo'... +adding manifests +adding file changes +added 5 changesets with 3 changes to 3 files /build/reproducible-path/git-remote-hg-1.0.5~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.5~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-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets ed36542f9696:7236e7028cca +new changesets ae2798a60523:ea7bf5eab0bd 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 23401cb469fe -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~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'... /build/reproducible-path/git-remote-hg-1.0.5~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 -[devel 76d0938] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files -new changesets 362b656574c3:54f595cbdf1f -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/5) 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 ed36542f9696:7236e7028cca +new changesets ae2798a60523:ea7bf5eab0bd 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.5~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. +[devel c42a6da] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.5~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] -[devel 76d0938] devel +[devel c42a6da] devel 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 +new changesets 48698150903c +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.5~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 +/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 +/build/reproducible-path/git-remote-hg-1.0.5~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 ok 3 - subcommand repo - with local proxy expecting success: @@ -1273,33 +1316,17 @@ grep "`cat rev-HEAD` `cat hg-HEAD`" mapfile ) -/build/reproducible-path/git-remote-hg-1.0.5~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 -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 -no changes found -searching for changes adding changesets adding manifests adding file changes added 5 changesets with 3 changes to 3 files -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +new changesets 362b656574c3:54f595cbdf1f +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/5) ok 5 - update bookmark expecting success: @@ -1334,95 +1361,48 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 -Cloning into 'gitrepo'... 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 ed36542f9696:ad69d80ee47d +new changesets ae2798a60523:5e67d04c4d5e progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -[feature-b ab7964d] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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.5~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.5~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 adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 0c69d7451eed -adding changesets -adding manifests -adding file changes adding remote bookmark devel -progress revision walk 'bookmarks/master' (0/0) adding remote bookmark feature-a -progress revision 0 'master' (0/1) added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets ed36542f9696:ad69d80ee47d +new changesets ae2798a60523:5e67d04c4d5e progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -[feature-b ab7964d] feature-b +searching for changes +no changes found +[feature-b 4c517d8] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~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 2 - file removal - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - ( - git init -q gitrepo && - cd gitrepo && - git config receive.denyCurrentBranch ignore && - echo alpha > alpha && - git add alpha && - git commit -m "add alpha" && - git tag alpha && - - echo beta > beta && - git add beta && - git commit -m "add beta" && - git tag -a -m "added tag beta" beta - ) && - - hg_clone gitrepo hgrepo && - git_clone hgrepo gitrepo2 && - hg_clone gitrepo2 hgrepo2 && - - hg_log hgrepo > expected && - hg_log hgrepo2 > actual && - - test_cmp expected actual - -[master (root-commit) 223a6f6] add alpha - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 alpha -[master 862befc] add beta - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 beta -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.5~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] +added 5 changesets with 3 changes to 3 files +Cloning into 'gitrepo'... +[feature-b 4c517d8] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -1433,10 +1413,23 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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.5~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 3923f476d86e +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 1 changesets with 1 changes to 1 files ok 6 - new bookmark expecting success: @@ -1469,14 +1462,41 @@ test_cmp expected actual -adding changesets -adding manifests -adding file changes /build/reproducible-path/git-remote-hg-1.0.5~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] -added 2 changesets with 2 changes to 2 files -searching for changes -searching for changes +ok 2 - file removal + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + ( + git init -q gitrepo && + cd gitrepo && + git config receive.denyCurrentBranch ignore && + echo alpha > alpha && + git add alpha && + git commit -m "add alpha" && + git tag alpha && + + echo beta > beta && + git add beta && + git commit -m "add beta" && + git tag -a -m "added tag beta" beta + ) && + + hg_clone gitrepo hgrepo && + git_clone hgrepo gitrepo2 && + hg_clone gitrepo2 hgrepo2 && + + hg_log hgrepo > expected && + hg_log hgrepo2 > actual && + + test_cmp expected actual + +[master (root-commit) 223a6f6] add alpha + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 alpha ok 6 - new bookmark expecting success: @@ -1509,12 +1529,28 @@ test_cmp expected actual +[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.5~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.5~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.5~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] Loading hg marks ... Loading git marks ... Writing mapfile ... -1f2b262b387a5ab3fbedd0741bfdd9969fd81eec 0c69d7451eedb3be6c32a100abdb682497a276b6 +3701cb36b9df42fce4cd6e77619c0c80a4d05d99 3923f476d86e03caebf6e355502830f8026ef630 ok 4 - subcommands hg-rev and git-rev and mapfile expecting success: @@ -1573,13 +1609,6 @@ adding file changes added 2 changesets with 2 changes to 2 files Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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 c3134ae6ffd8:6fac1d3e353c ok 3 - git tags expecting success: @@ -1618,10 +1647,15 @@ test_cmp expected actual +/build/reproducible-path/git-remote-hg-1.0.5~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 813c1fe47f91:0382fc271b3c 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.5~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/51016e2020e0-570beedf-backup.hg /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -1631,31 +1665,24 @@ adding file changes added 1 changesets with 1 changes to 1 files searching for changes -/build/reproducible-path/git-remote-hg-1.0.5~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] +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/2a5c9e449339-c3e8f4b4-backup.hg Cloning into 'gitrepo'... -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 9b863a3ee28d -progress revision 4 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - + 014cb0e...970894d master -> origin/master (forced update) - + 014cb0e...970894d branches/default -> origin/branches/default (forced update) -HEAD is now at 970894d four -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 41783755f2b6:c4f5239d0bda +new changesets c851adc51bbb:afb5558c255a progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 ok 7 - authors expecting success: @@ -1695,7 +1722,27 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +new changesets 0ef6f4c30075 +progress revision 4 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo + + 628233c...52ced2f master -> origin/master (forced update) + + 628233c...52ced2f branches/default -> origin/branches/default (forced update) +HEAD is now at 52ced2f four Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 12 changesets with 12 changes to 1 files +new changesets c851adc51bbb:b684e4da2e1d +progress revision walk 'bookmarks/master' (11/11) +progress revision 0 'master' (0/12) Loading hg marks ... Loading git marks ... Performing garbage collection on git commits ... @@ -1735,17 +1782,7 @@ test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.5~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 41783755f2b6:28558304fc3d -progress revision walk 'bookmarks/master' (11/11) -progress revision 0 'master' (0/12) +marked working directory as branch gamma ok 7 - authors expecting success: @@ -1785,13 +1822,10 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected -marked working directory as branch gamma Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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.5~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 @@ -1802,52 +1836,42 @@ 1 local changesets published progress revision 1 'default' (0/1) progress revision 2 'gamma' (0/1) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets c9be41955f08 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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] -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 2 changesets with 2 changes to 1 files -new changesets 6826e8eeae13:01712c04d041 +new changesets 8e5c0fffa4af:0b7aede9df4d +/build/reproducible-path/git-remote-hg-1.0.5~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) -/build/reproducible-path/git-remote-hg-1.0.5~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. +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 43b4b3b843a7 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~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 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo/.hg/strip-backup/0b7aede9df4d-87ca652e-backup.hg adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 2f8d3b4879de:f80ca999ebd5 +new changesets e1e41e777a28:ad78c2a69181 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.5~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] -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/01712c04d041-ea384304-backup.hg /build/reproducible-path/git-remote-hg-1.0.5~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 -added 1 changesets with 1 changes to 1 files -new changesets 7d6794a8475e -progress revision 1 'default' (0/1) -searching for changes no changes found -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - 879a7e8..3fd195d master -> origin/master - 879a7e8..3fd195d branches/default -> origin/branches/default searching for changes adding changesets adding manifests @@ -1861,70 +1885,85 @@ searching for changes searching for changes 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo/.hg/strip-backup/f80ca999ebd5-8a54af89-backup.hg -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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. +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/ad78c2a69181-c8529ee0-backup.hg +/build/reproducible-path/git-remote-hg-1.0.5~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 2 changesets with 2 changes to 1 files (+1 heads) -new changesets a890c26a7355:b1d86779d26a -progress revision 2 'default' (0/2) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo - + 2336fcd...180bd42 master -> origin/master (forced update) - + 2336fcd...180bd42 branches/default -> origin/branches/default (forced update) +added 1 changesets with 1 changes to 1 files +new changesets 10e52199302e +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo + d0ebddf..6ff172e master -> origin/master + d0ebddf..6ff172e branches/default -> origin/branches/default +0 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.5~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.5~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 adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets 16172e9bf667:683fe8f9114d +new changesets 9df3ca287492:44e4dfbe5c2c progress revision 2 'default' (0/2) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo - + 97e6f65...e8d2bae master -> origin/master (forced update) - + 97e6f65...e8d2bae branches/default -> origin/branches/default (forced update) -ok 6 - subcommand [some-repo] + + 659f50b...47dbc36 master -> origin/master (forced update) + + 659f50b...47dbc36 branches/default -> origin/branches/default (forced update) +/build/reproducible-path/git-remote-hg-1.0.5~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 2 changesets with 2 changes to 1 files (+1 heads) +new changesets cb792be16d97:1496d6bb5dfe +progress revision 2 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo + + 27046e6...767363e master -> origin/master (forced update) + + 27046e6...767363e branches/default -> origin/branches/default (forced update) +ok 4 - hg branch expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && - setup_repo hg hgrepo && ( - cd hgrepo && - setup_repo hg sub_hg_a && - setup_repo hg sub_hg_b && - setup_repo git sub_git && - echo "sub_hg_a = sub_hg_a" > .hgsub && - echo "sub_hg_b = sub_hg_b" >> .hgsub && - echo "sub_git = [git]sub_git" >> .hgsub && - hg add .hgsub && - hg commit -m substate - ) + git init -q gitrepo && + cd gitrepo && - git clone hg::hgrepo gitrepo && + echo alpha > alpha && + git add alpha && + git commit -m "add alpha" && + git checkout -q -b not-master + ) && ( - cd gitrepo && - git-hg-helper sub update --force && - test -f content_hgrepo && - test -f sub_hg_a/content_sub_hg_a && - test -f sub_hg_b/content_sub_hg_b && - test -f sub_git/content_sub_git + hg_clone gitrepo hgrepo && + + cd hgrepo && + hg co default && + hg tag alpha ) && - check gitrepo HEAD substate && - check gitrepo/sub_hg_a HEAD zero_sub_hg_a && - check gitrepo/sub_hg_b HEAD zero_sub_hg_b && - check gitrepo/sub_git HEAD zero_sub_git + hg_push hgrepo gitrepo && + # pushing a fetched tag is a problem ... + { hg_clone gitrepo hgrepo2 || true ; } && + + # fetch does not affect phase, but pushing now does + hg_log hgrepo | grep -v phase > expected && + hg_log hgrepo2 | grep -v phase > actual && + 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: @@ -1961,6 +2000,40 @@ test_cmp gitrepo/.GIT_ hgrepo/.GIT && test_cmp gitrepo/a/.gitmodules_ hgrepo/a/.gitmodules +ok 6 - subcommand [some-repo] + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repo hg hgrepo && + ( + cd hgrepo && + setup_repo hg sub_hg_a && + setup_repo hg sub_hg_b && + setup_repo git sub_git && + echo "sub_hg_a = sub_hg_a" > .hgsub && + echo "sub_hg_b = sub_hg_b" >> .hgsub && + echo "sub_git = [git]sub_git" >> .hgsub && + hg add .hgsub && + hg commit -m substate + ) + + git clone hg::hgrepo gitrepo && + + ( + cd gitrepo && + git-hg-helper sub update --force && + test -f content_hgrepo && + test -f sub_hg_a/content_sub_hg_a && + test -f sub_hg_b/content_sub_hg_b && + test -f sub_git/content_sub_git + ) && + + check gitrepo HEAD substate && + check gitrepo/sub_hg_a HEAD zero_sub_hg_a && + check gitrepo/sub_hg_b HEAD zero_sub_hg_b && + check gitrepo/sub_git HEAD zero_sub_git + ok 8 - strip expecting success: @@ -1997,44 +2070,6 @@ test_cmp gitrepo/.GIT_ hgrepo/.GIT && test_cmp gitrepo/a/.gitmodules_ hgrepo/a/.gitmodules -ok 4 - hg branch - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - ( - git init -q gitrepo && - cd gitrepo && - - echo alpha > alpha && - git add alpha && - git commit -m "add alpha" && - git checkout -q -b not-master - ) && - - ( - hg_clone gitrepo hgrepo && - - cd hgrepo && - hg co default && - hg tag alpha - ) && - - hg_push hgrepo gitrepo && - # pushing a fetched tag is a problem ... - { hg_clone gitrepo hgrepo2 || true ; } && - - # fetch does not affect phase, but pushing now does - hg_log hgrepo | grep -v phase > expected && - hg_log hgrepo2 | grep -v phase > actual && - - test_cmp expected actual - -[master (root-commit) 223a6f6] add alpha - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 alpha -warning: possible case-folding collision for .git warning: possible case-folding collision for .git /build/reproducible-path/git-remote-hg-1.0.5~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] @@ -2046,44 +2081,35 @@ added 1 changesets with 1 changes to 1 files searching for changes Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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 3 changes to 3 files -new changesets 62909f7c43d9 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +warning: possible case-folding collision for .git /build/reproducible-path/git-remote-hg-1.0.5~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 -[master 12ca732] one - Author: A U Thor - 2 files changed, 2 insertions(+), 2 deletions(-) adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files -new changesets 62909f7c43d9 +new changesets f8a504234046 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -[master 12ca732] one +[master 9b75d9a] one Author: A U Thor 2 files changed, 2 insertions(+), 2 deletions(-) /build/reproducible-path/git-remote-hg-1.0.5~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 2 changes to 2 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo - fffffff..12ca732 master -> master +added 1 changesets with 3 changes to 3 files +new changesets 03cb7a321b37 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master d7006d7] one + Author: A U Thor + 2 files changed, 2 insertions(+), 2 deletions(-) /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -2095,14 +2121,11 @@ adding file changes added 1 changesets with 2 changes to 2 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo - 6f396f2..12ca732 master -> master -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~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 + 005bb5d..9b75d9a master -> master /build/reproducible-path/git-remote-hg-1.0.5~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.5~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 @@ -2111,8 +2134,15 @@ added 1 changesets with 1 changes to 1 files new changesets 16869bbe54be 1 local changesets published -2 files updated, 0 files merged, 0 files removed, 0 files unresolved progress revision 1 'default' (0/1) +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 2 changes to 2 files +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo + fffffff..d7006d7 master -> master 2 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 9 - dotfiles @@ -2140,6 +2170,7 @@ check_branch hgrepo default two +2 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 9 - dotfiles expecting success: @@ -2166,18 +2197,13 @@ check_branch hgrepo default two -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 /build/reproducible-path/git-remote-hg-1.0.5~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 -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 633974296839:b6216f53afff -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) searching for changes no changes found searching for changes @@ -2194,19 +2220,18 @@ ! [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. -/build/reproducible-path/git-remote-hg-1.0.5~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'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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'... adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 8f7e6d2dd77c -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 2 changesets with 3 changes to 3 files +new changesets 4916be02c77c:b46593e0ed5b +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... ok 5 - hg tags expecting success: @@ -2271,102 +2296,86 @@ Date: Mon Jan 1 00:00:00 2007 -0130 1 file changed, 1 insertion(+) create mode 100644 epsilon -Cloning into 'gitrepo'... -Cloning into './sub_hg_b'... /build/reproducible-path/git-remote-hg-1.0.5~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 eb7b64edbad4:ed265952d92a -progress revision walk 'bookmarks/default' (1/1) -progress revision 0 'default' (0/2) -[default 5e2eb2c] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~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 changesets adding file changes +adding manifests +adding file changes +adding remote bookmark master +added 2 changesets with 2 changes to 1 files +new changesets b3649403d211:54c8bc6fad2f adding remote bookmark master added 2 changesets with 2 changes to 1 files -new changesets eb7b64edbad4:ed265952d92a +new changesets b3649403d211:54c8bc6fad2f progress revision walk 'bookmarks/default' (1/1) progress revision 0 'default' (0/2) +progress revision walk 'bookmarks/default' (1/1) +progress revision 0 'default' (0/2) +/build/reproducible-path/git-remote-hg-1.0.5~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'... +[default 8f789bc] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[default 8f789bc] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~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.5~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 +no changes found +/build/reproducible-path/git-remote-hg-1.0.5~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 manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 0bbc3e470d2c +new changesets f2758dd6c775 +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[default 5e2eb2c] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 './sub_git'... -no changes found -done. -searching for changes searching for changes adding changesets adding manifests +adding file changes +added 5 changesets with 5 changes to 5 files +no changes found +searching for changes adding changesets +/build/reproducible-path/git-remote-hg-1.0.5~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 manifests adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo + 36d85e6..8f789bc default -> default +Cloning into './sub_hg_b'... +no changes found +searching for changes +adding changesets +adding manifests adding file changes -added 5 changesets with 5 changes to 5 files added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo - fffffff..5e2eb2c default -> default -ok 7 - subcommand sub initial update (hg and git subrepos) - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_subrepos && - - git clone hg::hgrepo gitrepo && - - ( - cd gitrepo && - git-hg-helper sub --recursive update --force && - test -f content_hgrepo && - test -f sub_hg_a/content_sub_hg_a && - test -f sub_hg_a/sub_hg_a_x/content_sub_hg_a_x && - test -f sub_hg_b/content_sub_hg_b && - test -f sub_hg_b/sub_git/content_sub_git - ) && - - check gitrepo HEAD substate && - check gitrepo/sub_hg_a HEAD substate_hg_a && - check gitrepo/sub_hg_b HEAD substate_hg_b && - 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 - -/build/reproducible-path/git-remote-hg-1.0.5~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..8f789bc default -> default +/build/reproducible-path/git-remote-hg-1.0.5~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 -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.5~ds/test/trash directory.main/hgrepo - a3861de..5e2eb2c default -> default +new changesets 8187c683c7e1 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 10 - remote push with master bookmark expecting success: @@ -2390,6 +2399,8 @@ check_branch hgrepo default one +Cloning into './sub_git'... +done. ok 10 - remote push with master bookmark expecting success: @@ -2413,9 +2424,39 @@ check_branch hgrepo default one +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~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 +ok 7 - subcommand sub initial update (hg and git subrepos) + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_subrepos && + + git clone hg::hgrepo gitrepo && + + ( + cd gitrepo && + git-hg-helper sub --recursive update --force && + test -f content_hgrepo && + test -f sub_hg_a/content_sub_hg_a && + test -f sub_hg_a/sub_hg_a_x/content_sub_hg_a_x && + test -f sub_hg_b/content_sub_hg_b && + test -f sub_hg_b/sub_git/content_sub_git + ) && + + check gitrepo HEAD substate && + check gitrepo/sub_hg_a HEAD substate_hg_a && + check gitrepo/sub_hg_b HEAD substate_hg_b && + 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 + +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/gitrepo/.git/ /build/reproducible-path/git-remote-hg-1.0.5~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] -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/gitrepo/.git/ [master (root-commit) 64caca5] one Author: A U Thor 1 file changed, 1 insertion(+) @@ -2427,13 +2468,10 @@ new changesets 87c8f82b00d0:21e96c99dac4 progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/5) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~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 -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 @@ -2442,10 +2480,8 @@ added 1 changesets with 1 changes to 1 files To hg::../hgrepo * [new branch] master -> master -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 @@ -2454,14 +2490,20 @@ added 1 changesets with 1 changes to 1 files To hg::../hgrepo * [new branch] master -> master -/build/reproducible-path/git-remote-hg-1.0.5~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] changeset: 0:6e2126489d3d tag: tip user: A U Thor date: Mon Jan 01 00:00:00 2007 +0230 summary: one +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.5~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 @@ -2469,12 +2511,6 @@ 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 - ok 11 - remote push from master branch expecting success: @@ -2512,14 +2548,25 @@ # passed all 6 test(s) 1..6 +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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.5~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 changesets +adding manifests adding manifests adding file changes +adding file changes added 1 changesets with 1 changes to 1 files -new changesets 970e00e9777e -Cloning into 'gitrepo'... +new changesets 96f6f94409ff +added 1 changesets with 1 changes to 1 files +new changesets 96f6f94409ff +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 12 - remote cloning @@ -2535,19 +2582,6 @@ ) Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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 f5821f4ff3f0 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~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 12 - remote cloning expecting success: @@ -2560,32 +2594,39 @@ git fetch ) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 96f6f94409ff +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) adding changesets adding manifests -Cloning into 'gitrepo'... adding file changes added 1 changesets with 1 changes to 1 files -new changesets 970e00e9777e +new changesets 96f6f94409ff progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~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.5~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.5~ds/test/trash directory.helper/hgrepo/sub_hg_b/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 -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets f5821f4ff3f0 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~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 ok 13 - moving remote clone @@ -2608,12 +2649,6 @@ check_bookmark hgrepo devel devel -/build/reproducible-path/git-remote-hg-1.0.5~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 -Cloning into 'gitrepo'... ok 13 - moving remote clone expecting success: @@ -2635,48 +2670,49 @@ check_bookmark hgrepo devel devel +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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'... +/build/reproducible-path/git-remote-hg-1.0.5~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 970e00e9777e -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[devel e3f39d6] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~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 +new changesets 96f6f94409ff adding manifests adding file changes adding remote bookmark devel added 1 changesets with 1 changes to 1 files -new changesets f5821f4ff3f0 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel f769367] devel +new changesets 96f6f94409ff +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[devel dbafbce] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~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. +[devel dbafbce] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.5~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] -Cloning into 'gitrepo'... +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 -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 +Cloning into 'gitrepo'... no changes found searching for changes adding changesets @@ -2689,9 +2725,7 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 18f08a6df7d6:11f172b1de4c -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +new changesets 65f390a99603:627029a6137d ok 14 - remote update bookmark expecting success: @@ -2708,6 +2742,8 @@ check_bookmark hgrepo feature-b feature-b +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) Cloning into 'gitrepo'... ok 14 - remote update bookmark @@ -2726,60 +2762,60 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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'... /build/reproducible-path/git-remote-hg-1.0.5~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.5~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] adding changesets adding manifests adding file changes adding remote bookmark devel added 2 changesets with 2 changes to 1 files -new changesets 970e00e9777e:963af9f07a33 +new changesets 96f6f94409ff:f476090b6b45 /build/reproducible-path/git-remote-hg-1.0.5~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' (1/1) progress revision 0 'master' (0/2) WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +Cloning into './sub_hg_a'... +[feature-b 4a7f7b6] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes adding remote bookmark devel added 2 changesets with 2 changes to 1 files -new changesets f5821f4ff3f0:6a84155971b5 +new changesets 96f6f94409ff:f476090b6b45 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -[feature-b aee1de5] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[feature-b 3fb307d] feature-b +[feature-b 4a7f7b6] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~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.5~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.5~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 3 changes to 3 files -new changesets a43b6ab216d6:e4f8be4a1190 +new changesets f6c356a14418:4e335e431646 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.5~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 +Cloning into './sub_hg_a/sub_hg_a_x'... 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.5~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 './sub_hg_a/sub_hg_a_x'... searching for changes adding changesets adding manifests @@ -2817,7 +2853,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets a71a66da40da +new changesets c6f2e9e1398f progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~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. @@ -2856,34 +2892,37 @@ adding remote bookmark devel adding remote bookmark feature-b added 3 changesets with 3 changes to 1 files -new changesets f5821f4ff3f0:b095242ec9ee +new changesets 96f6f94409ff:cc52c490d552 progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) Cloning into './sub_hg_b'... +progress revision 0 'master' (0/3) /build/reproducible-path/git-remote-hg-1.0.5~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 +/build/reproducible-path/git-remote-hg-1.0.5~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 file changes adding remote bookmark devel adding remote bookmark feature-b added 3 changesets with 3 changes to 1 files -/build/reproducible-path/git-remote-hg-1.0.5~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 changesets 970e00e9777e:d66ea1e81f02 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(leaving bookmark devel) +new changesets 96f6f94409ff:cc52c490d552 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 72545ca65842:c1ae0c1a93ce +new changesets 0db35bfc417d:faa2b56a707d +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(leaving bookmark devel) progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into './sub_hg_b/sub_git'... done. +[master 8db6949] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) ok 8 - subcommand sub initial recursive update expecting success: @@ -2893,12 +2932,6 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark devel) -[master cd9d4d0] diverged - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[master 74da467] diverged - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -2908,7 +2941,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 5eda0256ddcc +new changesets d7dedc77c435 To hg::/build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main/hgrepo' @@ -2917,6 +2950,9 @@ 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) +[master 8db6949] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) ok 16 - remote push diverged expecting success: @@ -2948,6 +2984,7 @@ check_bookmark hgrepo diverge "bump bookmark" +1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -2955,7 +2992,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets dea9b8ff7bac +new changesets 40183af75c82 To hg::/build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main-push/hgrepo' @@ -2964,7 +3001,6 @@ 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) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 16 - remote push diverged expecting success: @@ -3009,16 +3045,13 @@ adding remote bookmark diverge adding remote bookmark feature-b added 4 changesets with 4 changes to 1 files -new changesets f5821f4ff3f0:5eda0256ddcc +new changesets 96f6f94409ff:d7dedc77c435 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) Cloning into 'gitrepo'... -created new head -[diverge 60274e3] diverge - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~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] +created new head adding changesets adding manifests adding file changes @@ -3026,9 +3059,16 @@ adding remote bookmark diverge adding remote bookmark feature-b added 4 changesets with 4 changes to 1 files -new changesets 970e00e9777e:dea9b8ff7bac +new changesets 96f6f94409ff:40183af75c82 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) +[diverge 03c4774] diverge + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +created new head +[diverge 03c4774] diverge + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -3039,7 +3079,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 3518c281d87d +new changesets 700b59651e2f To hg::/build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main/hgrepo' @@ -3048,10 +3088,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) -created new head -[diverge fad7e18] diverge - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) ok 17 - remote update bookmark diverge expecting success: @@ -3077,7 +3113,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets d4d049ad99c3 +new changesets 8813f9147991 To hg::/build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main-push/hgrepo' @@ -3097,11 +3133,11 @@ adding remote bookmark diverge adding remote bookmark feature-b added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets f5821f4ff3f0:3518c281d87d +new changesets 96f6f94409ff:700b59651e2f 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 892d982] feature-c +[feature-c 692ff9d] feature-c Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) ok 17 - remote update bookmark diverge @@ -3121,13 +3157,23 @@ check_bookmark hgrepo feature-c feature-c Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~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 (+1 heads) +/build/reproducible-path/git-remote-hg-1.0.5~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.5~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.5~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 @@ -3135,23 +3181,10 @@ adding remote bookmark diverge adding remote bookmark feature-b added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets 970e00e9777e:d4d049ad99c3 -/build/reproducible-path/git-remote-hg-1.0.5~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] +new changesets 96f6f94409ff:8813f9147991 WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/4) -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) -[feature-c 80f2ee2] feature-c - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) ok 18 - remote new bookmark multiple branch head checking known breakage: @@ -3191,6 +3224,9 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) +[feature-c 692ff9d] feature-c + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -3199,6 +3235,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) +Cloning into 'gitrepo'... ok 18 - remote new bookmark multiple branch head expecting success: @@ -3238,49 +3275,36 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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 0789193fad3c:6aa385b80e1b -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.5~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'... adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 04af8c4dbfaa +new changesets 180424eb5d04 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... -[master 258e2f5] copy +[master 770db4f] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master dbfdc2a] moved +[master 1a9a16d] 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.5~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.5~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.5~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 './sub_hg_a'... adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 4a14f40e1c25 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 2 changesets with 3 changes to 3 files +new changesets 562492dba45b:e7c24fa0f232 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -3292,45 +3316,48 @@ adding file changes added 2 changesets with 2 changes to 2 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo - 2afacde..dbfdc2a master -> master -[master 7b7e7f9] copy + 94e70b0..1a9a16d master -> master +/build/reproducible-path/git-remote-hg-1.0.5~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.5~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] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets e7f64218d279 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_hg_a'... +[master e4b870f] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master 0933a04] moved +[master 8017853] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.5~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 821cf2a3a620:985aabfe6cb6 +new changesets ae3dd1b4fc5b:956a8466e522 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.5~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 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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.5~ds/test/trash directory.main-push/hgrepo - fffffff..0933a04 master -> master -/build/reproducible-path/git-remote-hg-1.0.5~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 4d81a34f0f89 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) + fffffff..8017853 master -> master +Cloning into './sub_hg_a/sub_hg_a_x'... not ok 19 - push commits with copy and rename # TODO known breakage expecting success: @@ -3363,8 +3390,18 @@ echo "ø~?" > expected && test_cmp expected actual +/build/reproducible-path/git-remote-hg-1.0.5~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] 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets e54b00f015d7 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) Cloning into './sub_hg_b'... +warning: filename contains '?', which is reserved on Windows: 'ø~?' ok 19 - push commits with copy and rename expecting success: @@ -3403,44 +3440,36 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 7175f54a63ec:0e50c2319ff2 +new changesets 83cb66caf044:f25fe72ca29f 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. warning: filename contains '?', which is reserved on Windows: 'ø~?' warning: filename contains '?', which is reserved on Windows: 'ø~?' -/build/reproducible-path/git-remote-hg-1.0.5~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 8a8a18ee8bb0 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - a79dc2a..553e326 master -> origin/master - a79dc2a..553e326 branches/default -> origin/branches/default Cloning into 'gitrepo'... -warning: filename contains '?', which is reserved on Windows: 'ø~?' -Updating a79dc2a..553e326 -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) 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 3 changesets with 4 changes to 2 files -new changesets 5fc8c189ccbc:2b0363ea5cb9 -/build/reproducible-path/git-remote-hg-1.0.5~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. +new changesets 1d6b22116977:16b4ffb9b808 +/build/reproducible-path/git-remote-hg-1.0.5~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' (2/2) progress revision 0 'master' (0/3) -Cloning into 'gitrepo'... +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 662f4c5b8974 +progress revision 2 'default' (0/1) +warning: filename contains '?', which is reserved on Windows: 'ø~?' +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo + 17ad18c..6f83907 master -> origin/master + 17ad18c..6f83907 branches/default -> origin/branches/default ok 20 - fetch special filenames expecting success: @@ -3479,26 +3508,33 @@ printf "content\næ rø\n" > expected && test_cmp expected actual +Updating 17ad18c..6f83907 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~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] +adding changesets +adding manifests +adding file changes +added 3 changesets with 4 changes to 2 files +new changesets 031373b348a3:a642c76f1229 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) /build/reproducible-path/git-remote-hg-1.0.5~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 c6cfe970f2d7 +new changesets 43c1a032e6e3 progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a - aeeaaa1..e170484 branches/default -> origin/branches/default - aeeaaa1..e170484 master -> origin/master -adding changesets -adding manifests -adding file changes -added 3 changesets with 4 changes to 2 files -new changesets bfcda0c8fd98:f8c6c16c4f83 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) -HEAD is now at aeeaaa1 substate_hg_a + 2690ada..87b4c8c branches/default -> origin/branches/default + 2690ada..87b4c8c master -> origin/master ok 20 - fetch special filenames expecting success: @@ -3537,59 +3573,59 @@ printf "content\næ rø\n" > expected && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.5~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 1c0bc8156e41 -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - fae230f..10392bc branches/default -> origin/branches/default - fae230f..10392bc master -> origin/master WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -HEAD is now at fae230f zero_sub_hg_a_x +HEAD is now at 2690ada substate_hg_a adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 569866ca817d +new changesets 3cc10691e504 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 71447fd] utf-8 +[master a42608c] utf-8 Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 "\303\246 r\303\270" -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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 80389eba0917 +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + cb24520..58225cf branches/default -> origin/branches/default + cb24520..58225cf master -> origin/master 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 To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - c7d0fc5..71447fd master -> master + ce0b146..a42608c master -> master +HEAD is now at cb24520 zero_sub_hg_a_x +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~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] +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +no changes found adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 61da54925b84 +new changesets ffdb2b3dfc37 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master f98e1b5] utf-8 +[master 594b664] utf-8 Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 "\303\246 r\303\270" -1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 9 - subcommand sub subsequent recursive update expecting success: @@ -3662,7 +3698,7 @@ adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..f98e1b5 master -> master + fffffff..594b664 master -> master 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 21 - push special filenames @@ -3722,12 +3758,6 @@ check gitrepo origin/master one fi -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~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'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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] @@ -3740,32 +3770,19 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 40107b2e3015:5bb4d6d0d93d -/build/reproducible-path/git-remote-hg-1.0.5~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] -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 -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 34fb73caf372:b36436ea1b9f -HEAD is now at 5f4a578 zero +new changesets 11ea8e44d1b6:bb74c5a39d0e progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 5f4a578 zero -HEAD is now at 2bf84a2 good branch -HEAD is now at 2b142d7 zero -HEAD is now at 2b142d7 zero +HEAD is now at 24a4ebb zero +HEAD is now at 24a4ebb zero +HEAD is now at f3e93c8 good branch +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~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'... -HEAD is now at 6029a28 good branch -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 @@ -3783,13 +3800,23 @@ ! [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.5~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 3 changes to 3 files -new changesets 8f836f006193:558aeef80309 +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 3b277068089c:058b2ee47301 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at c437787 zero +HEAD is now at c437787 zero +HEAD is now at b9f51f9 good branch +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -3819,9 +3846,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.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..9de6412 branches/good_branch -> branches/good_branch - fffffff..1b1fc0e good_bmark -> good_bmark - fffffff..2560a4c master -> master + fffffff..23d9aa6 branches/good_branch -> branches/good_branch + fffffff..f72a8f3 good_bmark -> good_bmark + fffffff..6b42183 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) @@ -3832,48 +3859,36 @@ 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..2560a4c master -> master - fffffff..1b1fc0e good_bmark -> good_bmark - fffffff..9de6412 branches/good_branch -> branches/good_branch + fffffff..6b42183 master -> master + fffffff..f72a8f3 good_bmark -> good_bmark + fffffff..23d9aa6 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.5~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'... /build/reproducible-path/git-remote-hg-1.0.5~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 bd4b63a85abf:f2ae81e912b6 +new changesets f108f87413df:2813d354cad8 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.5~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.5~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] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 7e958e0a1c00 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... +Cloning into './sub_hg_a'... /build/reproducible-path/git-remote-hg-1.0.5~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 d424e43149cc:c3e361a6ae49 +new changesets 7a38e62bca7a:9f91cc79dd71 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. +Cloning into './sub_hg_a/sub_hg_a_x'... ok 22 - remote big push expecting success: @@ -3958,6 +3973,25 @@ fi ) +/build/reproducible-path/git-remote-hg-1.0.5~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 ab728aadcdcf +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.5~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 d4744041d3bd:4c59f443aa7f +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 22 - remote big push expecting success: @@ -4042,22 +4076,39 @@ fi ) +Cloning into './sub_hg_b/sub_git'... +done. /build/reproducible-path/git-remote-hg-1.0.5~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 ca65af35bb07 +new changesets 1f23a158f9df progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - 595f5c9..64e0f5c master -> origin/master - 595f5c9..64e0f5c branches/default -> origin/branches/default -Updating 595f5c9..64e0f5c + 036acac..0716584 master -> origin/master + 036acac..0716584 branches/default -> origin/branches/default +/build/reproducible-path/git-remote-hg-1.0.5~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 +Updating 036acac..0716584 Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +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 ec553185bb07:faf81f1a585c +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.5~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.5~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. @@ -4067,65 +4118,40 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets f1ced3ef2feb +new changesets 6c11bd7b3127 progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a - 5ad2bde..51e2620 branches/default -> origin/branches/default - 5ad2bde..51e2620 master -> origin/master -HEAD is now at 5ad2bde substate_hg_a -Successfully rebased and updated detached HEAD. -/build/reproducible-path/git-remote-hg-1.0.5~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 8158e1dafab8 -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 711cf5a..c5bc710 branches/default -> origin/branches/default - 711cf5a..c5bc710 master -> origin/master -HEAD is now at 711cf5a zero_sub_hg_a_x + 5113723..ed28e17 branches/default -> origin/branches/default + 5113723..ed28e17 master -> origin/master +HEAD is now at 5113723 substate_hg_a Successfully rebased and updated detached HEAD. Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 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 414e1fc1028e:e0cf655dcc8a +new changesets d5fe69f7bc9b:5c201cc168e3 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.5~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.5~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 +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 414e1fc1028e:22d1ed58bc43 -ok 10 - subcommand sub subsequent recursive update -- rebase - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --merge - -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 c9695424d659 +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + 2754f0e..bf188fa branches/default -> origin/branches/default + 2754f0e..bf188fa master -> origin/master +HEAD is now at 2754f0e zero_sub_hg_a_x +Successfully rebased and updated detached HEAD. /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -4136,7 +4162,7 @@ adding file changes updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets 5f53448e622b +new changesets 3aac86152f5f To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) @@ -4147,66 +4173,34 @@ hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [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.5~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 2473881b360e -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.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..c6c2288 good_bmark -> good_bmark - fffffff..ab580af 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.5~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..ab580af master -> master - fffffff..c6c2288 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.5~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.5~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.5~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) no changes found -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - 4dc9dec..805dc70 branches/bad_branch -> origin/branches/bad_branch - c1cc653..ab580af branches/default -> origin/branches/default - c1cc653..805dc70 bad_bmark -> origin/bad_bmark -progress revision 3 'bad_branch' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - 7351b1a..08afcdd branches/bad_branch -> origin/branches/bad_branch - c1cc653..08afcdd bad_bmark -> origin/bad_bmark -/build/reproducible-path/git-remote-hg-1.0.5~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. + 2359b68..d891958 branches/bad_branch -> origin/branches/bad_branch + e6b6d8b..d891958 bad_bmark -> origin/bad_bmark +ok 10 - subcommand sub subsequent recursive update -- rebase + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update --merge + +/build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main-push/tmp/hgrepo +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo ! [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.5~ds/test/trash directory.main-push/tmp/hgrepo' +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~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. @@ -4258,15 +4252,57 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 ba09ba1e9fcd +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.5~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..764b66d good_bmark -> good_bmark + fffffff..6aa088c 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.5~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..6aa088c master -> master + fffffff..764b66d 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.5~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 -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo +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.5~ds/test/trash directory.main-push/tmp/hgrepo + b7a9d72..9ce7986 branches/bad_branch -> origin/branches/bad_branch + 213fdcb..6aa088c branches/default -> origin/branches/default + 213fdcb..9ce7986 bad_bmark -> origin/bad_bmark +/build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main-push/tmp/hgrepo ! [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.5~ds/test/trash directory.main/tmp/hgrepo' +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~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. @@ -4324,64 +4360,49 @@ 1 file changed, 1 insertion(+) create mode 100644 content_sub_git Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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 5c8ee8ee1619:abbd12c6cbb2 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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.5~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'... adding changesets adding manifests adding file changes -Cloning into './sub_hg_a'... 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 fc47e3e994fc:042ca290f199 +new changesets 1fdd31bd71c6:623b811dd863 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) +HEAD is now at 8afe586 zero +HEAD is now at 8afe586 zero +HEAD is now at 9257fff good branch Cloning into 'gitrepo'... -HEAD is now at 4fe0d3d zero -HEAD is now at 4fe0d3d zero -HEAD is now at 1af58ad good branch -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets fc47e3e994fc:042ca290f199 +added 2 changesets with 3 changes to 3 files +new changesets a7ae44979ee2:ed830a60fce7 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.5~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 3 changes to 3 files -new changesets 79c60bf47c89:da44857c2eb9 +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 72017c409a64:3119bd17d0e2 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -HEAD is now at 4fe0d3d zero -HEAD is now at 4fe0d3d zero -Cloning into './sub_hg_a/sub_hg_a_x'... -HEAD is now at 1af58ad good branch +progress revision 2 'bad_branch' (0/2) +HEAD is now at ef6fd19 zero /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -4393,32 +4414,37 @@ adding file changes added 9 changesets with 9 changes to 1 files (+7 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - + 56b9229...4aeed0f branches/bad_branch -> branches/bad_branch (forced update) - 1af58ad..b6ec26f branches/good_branch -> branches/good_branch - + 7d2601b...40ee8fc bad_bmark1 -> bad_bmark1 (forced update) - + 7d2601b...6694c21 bad_bmark2 -> bad_bmark2 (forced update) - 7d2601b..11d7b84 good_bmark -> good_bmark - 7d2601b..99d0ce8 master -> master + + 30359b6...f779556 branches/bad_branch -> branches/bad_branch (forced update) + 9257fff..6cb02f4 branches/good_branch -> branches/good_branch + + c4636b0...8e8568b bad_bmark1 -> bad_bmark1 (forced update) + + c4636b0...5aa224f bad_bmark2 -> bad_bmark2 (forced update) + c4636b0..5f92c31 good_bmark -> good_bmark + c4636b0..f97aa1b master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - 7d2601b..99d0ce8 master -> master - 7d2601b..11d7b84 good_bmark -> good_bmark - 1af58ad..b6ec26f branches/good_branch -> branches/good_branch + c4636b0..f97aa1b master -> master + c4636b0..5f92c31 good_bmark -> good_bmark + 9257fff..6cb02f4 branches/good_branch -> branches/good_branch +HEAD is now at ef6fd19 zero * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + 7d2601b...40ee8fc bad_bmark1 -> bad_bmark1 (forced update) - + 7d2601b...6694c21 bad_bmark2 -> bad_bmark2 (forced update) - + 56b9229...4aeed0f branches/bad_branch -> branches/bad_branch (forced update) + + c4636b0...8e8568b bad_bmark1 -> bad_bmark1 (forced update) + + c4636b0...5aa224f bad_bmark2 -> bad_bmark2 (forced update) + + 30359b6...f779556 branches/bad_branch -> branches/bad_branch (forced update) +/build/reproducible-path/git-remote-hg-1.0.5~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] +HEAD is now at f1a9f16 good branch +Cloning into './sub_hg_a'... /build/reproducible-path/git-remote-hg-1.0.5~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 a2a80425aad5 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... +added 2 changesets with 3 changes to 3 files +new changesets ae8613539369:b0e8bd8c3245 +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.5~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 @@ -4463,29 +4489,39 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...4aeed0f branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...b6ec26f branches/good_branch -> branches/good_branch (forced update) - + fffffff...40ee8fc bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...6694c21 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...11d7b84 good_bmark -> good_bmark (forced update) - + fffffff...99d0ce8 master -> master (forced update) + + fffffff...ed735a1 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...77bff79 branches/good_branch -> branches/good_branch (forced update) + + fffffff...7bd0a6d bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...ae9e9db bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...12e43fb good_bmark -> good_bmark (forced update) + + fffffff...0526b70 master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...99d0ce8 master -> master (forced update) - + fffffff...11d7b84 good_bmark -> good_bmark (forced update) - + fffffff...b6ec26f branches/good_branch -> branches/good_branch (forced update) + + fffffff...0526b70 master -> master (forced update) + + fffffff...12e43fb good_bmark -> good_bmark (forced update) + + fffffff...77bff79 branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...40ee8fc bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...6694c21 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...4aeed0f branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...7bd0a6d bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...ae9e9db bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...ed735a1 branches/bad_branch -> branches/bad_branch (forced update) +/build/reproducible-path/git-remote-hg-1.0.5~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 317eb103f42e +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.5~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 5b39cd956311:0f33d10832c4 +new changesets a98de9fe1e9e:81d56bc8cf88 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into './sub_hg_b/sub_git'... @@ -4599,12 +4635,12 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 4a6c08981b05 +new changesets 4171233396fe progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - f58b96a..3c83c6a master -> origin/master - f58b96a..3c83c6a branches/default -> origin/branches/default -Updating f58b96a..3c83c6a + 3321174..85c0024 master -> origin/master + 3321174..85c0024 branches/default -> origin/branches/default +Updating 3321174..85c0024 Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -4617,13 +4653,13 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 33ea38635013 +new changesets 79a7868725a7 progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a - c422259..10440e3 branches/default -> origin/branches/default - c422259..10440e3 master -> origin/master -HEAD is now at c422259 substate_hg_a -Updating c422259..10440e3 + 4e23552..3eda778 branches/default -> origin/branches/default + 4e23552..3eda778 master -> origin/master +HEAD is now at 4e23552 substate_hg_a +Updating 4e23552..3eda778 Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -4634,13 +4670,13 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 4e586d0cffc2 +new changesets 083a5c94203a progress revision 1 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 8b65c2c..e7d56f8 branches/default -> origin/branches/default - 8b65c2c..e7d56f8 master -> origin/master -HEAD is now at 8b65c2c zero_sub_hg_a_x -Updating 8b65c2c..e7d56f8 + ef91888..c64febc branches/default -> origin/branches/default + ef91888..c64febc master -> origin/master +HEAD is now at ef91888 zero_sub_hg_a_x +Updating ef91888..c64febc Fast-forward content_sub_hg_a_x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -4666,30 +4702,14 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 428512381f2c:ded506796792 +new changesets ffe868a0b0a2:a982298377d7 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 46bfee8 zero -HEAD is now at 46bfee8 zero +HEAD is now at fbea135 zero +HEAD is now at fbea135 zero +HEAD is now at 9ad862b good branch Cloning into 'gitrepo'... -HEAD is now at 8357f78 good branch -/build/reproducible-path/git-remote-hg-1.0.5~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 34412b8de1e1:53734d5b547f -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at 8f7259b zero -HEAD is now at 8f7259b zero -HEAD is now at a7b2286 good branch /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -4707,29 +4727,45 @@ ! [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.5~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 4018d0e12898:de31373dd508 +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.5~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.5~ds/test/trash directory.main/tmp/hgrepo - 8357f78..8367340 branches/good_branch -> branches/good_branch - 17d3e13..b3b7b38 good_bmark -> good_bmark - 17d3e13..f5682ec master -> master + 9ad862b..665f9e8 branches/good_branch -> branches/good_branch + 11c47c9..6ef0bd7 good_bmark -> good_bmark + 11c47c9..6087c25 master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - 17d3e13..f5682ec master -> master - 17d3e13..b3b7b38 good_bmark -> good_bmark - 8357f78..8367340 branches/good_branch -> branches/good_branch + 11c47c9..6087c25 master -> master + 11c47c9..6ef0bd7 good_bmark -> good_bmark + 9ad862b..665f9e8 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch +HEAD is now at 5db09c4 zero +HEAD is now at 5db09c4 zero +HEAD is now at 97db849 good branch /build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..2894437 branches/good_branch -> branches/good_branch - fffffff..6bf5277 good_bmark -> good_bmark - fffffff..cd0fffe master -> master + fffffff..6726d3f branches/good_branch -> branches/good_branch + fffffff..ef07efe good_bmark -> good_bmark + fffffff..57ffa8d 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) @@ -4740,9 +4776,9 @@ 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..cd0fffe master -> master - fffffff..6bf5277 good_bmark -> good_bmark - fffffff..2894437 branches/good_branch -> branches/good_branch + fffffff..57ffa8d master -> master + fffffff..ef07efe good_bmark -> good_bmark + fffffff..6726d3f 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) @@ -4752,21 +4788,16 @@ or locale.getdefaultlocale()[1] no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..2894437 branches/good_branch -> branches/good_branch - fffffff..6bf5277 good_bmark -> good_bmark - fffffff..cd0fffe master -> master + fffffff..6726d3f branches/good_branch -> branches/good_branch + fffffff..ef07efe good_bmark -> good_bmark + fffffff..57ffa8d master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - fffffff..cd0fffe master -> master - fffffff..6bf5277 good_bmark -> good_bmark - fffffff..2894437 branches/good_branch -> branches/good_branch + fffffff..57ffa8d master -> master + fffffff..ef07efe good_bmark -> good_bmark + fffffff..6726d3f 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.5~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 ok 25 - remote big push dry-run expecting success: @@ -4813,7 +4844,11 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -Cloning into 'gitrepo'... +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~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 ok 25 - remote big push dry-run expecting success: @@ -4860,13 +4895,14 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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 1da8afd469b1:2d39d17054dd +new changesets 1e30c50ab348:01cd71c7e140 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.5~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. @@ -4878,31 +4914,72 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 9781f197963d:3c5b27b9d4cb +new changesets 5b1847879521:a41e8bab38ef progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into './sub_hg_a/sub_hg_a_x'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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 5a7bd1cca0d1 +new changesets 4b7805708e45 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.5~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 bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +added 4 changesets with 4 changes to 1 files +new changesets a24262297e4d:4f73f41c8357 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) Cloning into './sub_hg_b'... +HEAD is now at 739d4ab zero +HEAD is now at 739d4ab zero +HEAD is now at 1880751 good branch /build/reproducible-path/git-remote-hg-1.0.5~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 9d94149d6571:7c42fd8f151c +new changesets 8fea129e4a2e:6d7474d62eda 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.5~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.5~ds/test/trash directory.main/tmp/hgrepo + + 6a390cc...8326d47 branches/bad_branch -> branches/bad_branch (forced update) + 1880751..c9d7153 branches/good_branch -> branches/good_branch + + d67eebf...611eddc bad_bmark1 -> bad_bmark1 (forced update) + + d67eebf...31eaf4f bad_bmark2 -> bad_bmark2 (forced update) + d67eebf..dcb926b good_bmark -> good_bmark + d67eebf..d4bc44c master -> master + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + d67eebf..d4bc44c master -> master + d67eebf..dcb926b good_bmark -> good_bmark + 1880751..c9d7153 branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + d67eebf...611eddc bad_bmark1 -> bad_bmark1 (forced update) + + d67eebf...31eaf4f bad_bmark2 -> bad_bmark2 (forced update) + + 6a390cc...8326d47 branches/bad_branch -> branches/bad_branch (forced update) Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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] @@ -4915,15 +4992,16 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets bdde1c6fe575:432209dceacc +new changesets 91292bc64126:ae42392a0971 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -Cloning into 'gitrepo'... -hg be9714f07cbdb6e37fe6cd00ab20430a20b613a0 3c5b27b9d4cbe525da75e524ad20418b236e3847 sub_hg_a /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo -hg 96c1f6ffdc2ba3dbbdb03719b8335d73a3a9442f 5a7bd1cca0d19508cce4c03a8bb25253c3e87efb sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo/sub_hg_a -hg cfaf240b3f06bad7b2c90653e0bf9f957173d1d3 7c42fd8f151c192b4da5f60bf92129c194d910d0 sub_hg_b /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo +HEAD is now at 511d14f zero +hg 726f199ff7d29b77d015418a8cf2015e14c9053c a41e8bab38efa398c80c040cfbe249eaf4a7fd3d sub_hg_a /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo +hg 911e2177b036651c246f3c03f65b23dc583701bb 4b7805708e45757afcd657b6c27b3faf06485920 sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo/sub_hg_a +hg 50a98d8d40a63b4657902c6c89bd9a8bdb455950 6d7474d62eda6a43e0957faaccb3d96569c1a573 sub_hg_b /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo git e9a16bb7c08361f85ab0002e4094b4229fefb384 e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo/sub_hg_b +HEAD is now at 511d14f zero ok 12 - subcommand sub foreach expecting success: @@ -4956,82 +5034,27 @@ test_cmp expected actual ) -HEAD is now at dd7fcb3 zero -HEAD is now at dd7fcb3 zero -HEAD is now at 0d77f17 good branch -/build/reproducible-path/git-remote-hg-1.0.5~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 bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets aa33659e08f0:f98f86f4219a -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at ad97a8c zero -HEAD is now at ad97a8c zero -HEAD is now at be55007 good branch +HEAD is now at 557037b good branch /build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...8609f9d branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...dd7eaf1 branches/good_branch -> branches/good_branch (forced update) - + fffffff...1a63683 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...c21e547 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...636978f good_bmark -> good_bmark (forced update) - + fffffff...957a232 master -> master (forced update) + + fffffff...7bb6012 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...efc6158 branches/good_branch -> branches/good_branch (forced update) + + fffffff...f4055d8 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...fa9acfa bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...47186f0 good_bmark -> good_bmark (forced update) + + fffffff...f5e09fb master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...957a232 master -> master (forced update) - + fffffff...636978f good_bmark -> good_bmark (forced update) - + fffffff...dd7eaf1 branches/good_branch -> branches/good_branch (forced update) + + fffffff...f5e09fb master -> master (forced update) + + fffffff...47186f0 good_bmark -> good_bmark (forced update) + + fffffff...efc6158 branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...1a63683 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...c21e547 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...8609f9d branches/bad_branch -> branches/bad_branch (forced update) -/build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main/tmp/hgrepo - + 8acdb06...d5009de branches/bad_branch -> branches/bad_branch (forced update) - be55007..9727d2a branches/good_branch -> branches/good_branch - + 26a08d1...073d43b bad_bmark1 -> bad_bmark1 (forced update) - + 26a08d1...e9aed8a bad_bmark2 -> bad_bmark2 (forced update) - 26a08d1..fd9695e good_bmark -> good_bmark - 26a08d1..47b6204 master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - 26a08d1..47b6204 master -> master - 26a08d1..fd9695e good_bmark -> good_bmark - be55007..9727d2a branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + 26a08d1...073d43b bad_bmark1 -> bad_bmark1 (forced update) - + 26a08d1...e9aed8a bad_bmark2 -> bad_bmark2 (forced update) - + 8acdb06...d5009de branches/bad_branch -> branches/bad_branch (forced update) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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 b1ce699c17b3:7df11067517f -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.5~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'... + + fffffff...f4055d8 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...fa9acfa bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...7bb6012 branches/bad_branch -> branches/bad_branch (forced update) ok 26 - remote big push force dry-run expecting success: @@ -5057,8 +5080,17 @@ test_expect_code 1 git push ) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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 38c8ae58dd10:ffac69af6a15 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... ok 26 - remote big push force dry-run expecting success: @@ -5084,17 +5116,70 @@ test_expect_code 1 git push ) +/build/reproducible-path/git-remote-hg-1.0.5~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'... +/build/reproducible-path/git-remote-hg-1.0.5~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 4cd4231c76d7:32a7a05ab75b +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +HEAD is now at e6a0899 zero +[master dd2aa90] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.5~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 29fe4780ec26 +new changesets 98c5365f9046 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) - url = foobar Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~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.5~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.5~ds/test/trash directory.main/tmp/hgrepo' + url = foobar +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.5~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 86e481f2eca8:abcef4833f4a +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.5~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] +HEAD is now at 66d6c80 zero +[master a913dfe] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.5~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.5~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.5~ds/test/trash directory.main/tmp/hgrepo' ok 13 - subcommand sub sync expecting success: @@ -5159,63 +5244,6 @@ check_branch hgclone/sub_hg default one_sub_hg && check hgclone/sub_git HEAD one_sub_git -/build/reproducible-path/git-remote-hg-1.0.5~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 2 changesets with 2 changes to 1 files -new changesets 9e0711cb2149:fe7f74414e4c -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -HEAD is now at b3315de zero -[master d0fd1da] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 f9063ad29268:1c6aeba11371 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.5~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.5~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. -HEAD is now at 47faec3 zero -[master 4c799e0] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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.5~ds/test/trash directory.main/tmp/hgrepo' -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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.5~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. 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. @@ -5251,19 +5279,22 @@ ! grep feature-a out ) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~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 -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo +To hg::/build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main/tmp/hgrepo' +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~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.5~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.5~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.5~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. @@ -5300,19 +5331,24 @@ ) Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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. +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~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 +/build/reproducible-path/git-remote-hg-1.0.5~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 6774479b548e:6c959c495609 +adding remote bookmark feature-a +added 2 changesets with 2 changes to 1 files +new changesets f5c61d3e9c3c:5782bfe5f66c progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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] @@ -5321,55 +5357,19 @@ adding file changes adding remote bookmark feature-a added 2 changesets with 2 changes to 1 files -new changesets 901d23ed64eb:92dbeba6bac9 +new changesets 1b0301182a0c:bfa9eeda2cbd progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.5~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.5~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 feature-a -added 2 changesets with 2 changes to 1 files -new changesets d8a3bed44379:203e98a5fae3 -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 868de9e7bd80 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_git'... -done. -[detached HEAD 4e84bf4] one_sub_hg - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg - fffffff..4e84bf4 HEAD -> master error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - [deleted] (none) -> origin/feature-a -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 ok 28 - fetch prune expecting success: @@ -5414,10 +5414,22 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 31c1a080f8fe:8bf4653290d0 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.5~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 error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - [deleted] (none) -> origin/feature-a +/build/reproducible-path/git-remote-hg-1.0.5~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'... ok 28 - fetch prune expecting success: @@ -5464,33 +5476,21 @@ /build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.helper/hgrepo/sub_hg - abcd565..4e84bf4 branches/default -> origin/branches/default -[detached HEAD cea1af1] one_sub_git +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets eb9d7250552c +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +Cloning into './sub_git'... +done. +[detached HEAD d386fc9] one_sub_hg Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -To /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git - * [new branch] HEAD -> new -/build/reproducible-path/git-remote-hg-1.0.5~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] -Updating ./sub_hg to 20bc69d47c617ecd6d9a8805ef73d8c6824c7e70 [git 4e84bf4] -Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] -diff --git a/.hgsubstate b/.hgsubstate -index 8e66bdd..7e39bb7 100644 ---- a/.hgsubstate -+++ b/.hgsubstate -@@ -1,2 +1,2 @@ --e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git --868de9e7bd801861cee7c68045ec89d26b383eae sub_hg -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git -+20bc69d47c617ecd6d9a8805ef73d8c6824c7e70 sub_hg - M .hgsubstate -[master dd1ead6] update_sub - Author: A U Thor - 1 file changed, 2 insertions(+), 2 deletions(-) -0 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/gitrepo/ /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -5499,40 +5499,18 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - fffffff..dd1ead6 master -> master +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg + fffffff..d386fc9 HEAD -> master 0 files updated, 0 files merged, 1 files removed, 0 files unresolved -Cloning into '/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgclone/sub_git'... -done. -Switched to a new branch 'new' -updating to branch default -cloning subrepo sub_git from /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git -cloning subrepo sub_hg from /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg -3 files updated, 0 files merged, 0 files removed, 0 files unresolved -created new head -created new head -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/gitrepo/ -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/gitrepo/ -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 changesets -adding manifests adding manifests adding file changes -adding file changes -added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets 947ddb96e2b9:e4e3c4884079 added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets c7bc86b73a54:e4e3c4884079 -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) +new changesets d81d1de23e53:079a73a4c694 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) @@ -5541,87 +5519,93 @@ * [new branch] master -> master * [new branch] branches/default -> origin/branches/default * [new branch] master -> origin/master +/build/reproducible-path/git-remote-hg-1.0.5~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 +1 local changesets published +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg + 62126aa..d386fc9 branches/default -> origin/branches/default +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/gitrepo/ +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +[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.5~ds/test/trash directory.helper/hgrepo/sub_git + * [new branch] HEAD -> new +/build/reproducible-path/git-remote-hg-1.0.5~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 8ee4c46ee1fa:d0f6fa3ce75e +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 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved -1 files updated, 0 files merged, 1 files removed, 0 files unresolved -ok 14 - subcommand sub addstate - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repo hg hgrepo && - ( - cd hgrepo && - setup_repo hg sub_hg_a && - setup_repo hg sub_hg_b && - setup_repo git sub_git && - echo "sub_hg_a = sub_hg_a" > .hgsub && - echo "sub_hg_b = sub_hg_b" >> .hgsub && - echo "sub_git = [git]sub_git" >> .hgsub && - hg add .hgsub && - hg commit -m substate - ) - - git clone hg::hgrepo gitrepo && - - ( - cd gitrepo && - git-hg-helper sub update --force sub_hg_a && - git-hg-helper sub update --force sub_git && - ( - # advance and add a tag to the git repo - cd sub_git && - echo one > content_sub_git && - git add content_sub_git && - git commit -m one_sub_git && - git tag feature-a - ) && - - git-hg-helper sub status --cached > output && - cat output && - grep "^ .*sub_hg_a (.*master.*)$" output && - grep "^-.*sub_hg_b$" output && - grep "^+.*sub_git (feature-a~1)$" output && - git-hg-helper sub status sub_git > output && - cat output && - grep "^+.*sub_git (feature-a)$" output > actual && - test_cmp output actual - ) - -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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] +Updating ./sub_hg to 85ade28af5117f1e81097f1585a23652f30a5697 [git d386fc9] +Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +diff --git a/.hgsubstate b/.hgsubstate +index e6fe927..68da4e8 100644 +--- a/.hgsubstate ++++ b/.hgsubstate +@@ -1,2 +1,2 @@ +-e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git +-eb9d7250552c66bd76f0f67a3c7a76627b185ec7 sub_hg ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git ++85ade28af5117f1e81097f1585a23652f30a5697 sub_hg + M .hgsubstate +[master ac1aea1] update_sub + Author: A U Thor + 1 file changed, 2 insertions(+), 2 deletions(-) /build/reproducible-path/git-remote-hg-1.0.5~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 2793b59481f1 +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.5~ds/test/trash directory.main/tmp/hgrepo + + 8ed0251...0513518 branches/default -> origin/branches/default (forced update) + + 8ed0251...0513518 master -> origin/master (forced update) +/build/reproducible-path/git-remote-hg-1.0.5~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 +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo + fffffff..ac1aea1 master -> master +/build/reproducible-path/git-remote-hg-1.0.5~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 -new changesets 997f506a995b adding manifests adding file changes -WARNING: Branch 'default' has more than one head, consider merging -progress revision walk 'branches/default' (2/2) -progress revision 0 'default' (0/2) added 1 changesets with 1 changes to 1 files -new changesets 67cf045263ac -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - + eecb0b7...91ab600 branches/default -> origin/branches/default (forced update) - + eecb0b7...91ab600 master -> origin/master (forced update) +new changesets df540568a79d 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.5~ds/test/trash directory.main-push/tmp/hgrepo - + eecb0b7...64f6879 branches/default -> origin/branches/default (forced update) - + eecb0b7...64f6879 master -> origin/master (forced update) + + d8d3f49...c6ff4be branches/default -> origin/branches/default (forced update) + + d8d3f49...c6ff4be master -> origin/master (forced update) ok 29 - fetch multiple independent histories expecting success: @@ -5648,6 +5632,13 @@ git push origin bookmark ) +Cloning into '/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgclone/sub_git'... +done. +Switched to a new branch 'new' +updating to branch default +cloning subrepo sub_git from /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git +cloning subrepo sub_hg from /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg +3 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 29 - fetch multiple independent histories expecting success: @@ -5674,13 +5665,52 @@ git push origin bookmark ) +0 files updated, 0 files merged, 0 files removed, 0 files unresolved Cloning into 'gitrepo'... -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~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'... +ok 14 - subcommand sub addstate + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repo hg hgrepo && + ( + cd hgrepo && + setup_repo hg sub_hg_a && + setup_repo hg sub_hg_b && + setup_repo git sub_git && + echo "sub_hg_a = sub_hg_a" > .hgsub && + echo "sub_hg_b = sub_hg_b" >> .hgsub && + echo "sub_git = [git]sub_git" >> .hgsub && + hg add .hgsub && + hg commit -m substate + ) + + git clone hg::hgrepo gitrepo && + + ( + cd gitrepo && + git-hg-helper sub update --force sub_hg_a && + git-hg-helper sub update --force sub_git && + ( + # advance and add a tag to the git repo + cd sub_git && + echo one > content_sub_git && + git add content_sub_git && + git commit -m one_sub_git && + git tag feature-a + ) && + + git-hg-helper sub status --cached > output && + cat output && + grep "^ .*sub_hg_a (.*master.*)$" output && + grep "^-.*sub_hg_b$" output && + grep "^+.*sub_git (feature-a~1)$" output && + git-hg-helper sub status sub_git > output && + cat output && + grep "^+.*sub_git (feature-a)$" output > actual && + test_cmp output actual + ) + /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -5690,13 +5720,14 @@ adding file changes adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -new changesets 0f0257055391 +new changesets 74d29348bdc1 WARNING: Ignoring invalid bookmark 'bookmark' progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... origin hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo (fetch) origin hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo (push) -[bookmark 3a48553] b +[bookmark a55cff6] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b @@ -5707,14 +5738,13 @@ adding file changes adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -new changesets 0f0257055391 +new changesets d486578f759c WARNING: Ignoring invalid bookmark 'bookmark' progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... origin hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo (fetch) origin hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo (push) -[bookmark 3a48553] b +[bookmark 2050c0f] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b @@ -5731,15 +5761,6 @@ added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo * [new branch] bookmark -> bookmark -/build/reproducible-path/git-remote-hg-1.0.5~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 3bd05a1c4472:2e51756cf2a6 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) ok 30 - clone remote with null bookmark, then push expecting success: @@ -5771,11 +5792,6 @@ added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo * [new branch] bookmark -> bookmark -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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'... ok 30 - clone remote with null bookmark, then push expecting success: @@ -5796,54 +5812,31 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.5~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 d8686975dd70 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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(-) Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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.5~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.5~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 +Cloning into 'gitrepo'... added 2 changesets with 2 changes to 1 files -new changesets 929dc120353c:dc17843643a4 +new changesets 9771e2f3edf8:aa8352d4f1b9 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) - 2720dcc1d225199bf4d01db9957f92ce22cf058a ./sub_hg_a (heads/master) --752dc4a6ef66bfb8cff0c793ad62fa0746d9180d[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) +/build/reproducible-path/git-remote-hg-1.0.5~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 3afe88e85c14:9da467353abd +new changesets 8d5e3fa67a9e:15037e29c2c1 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 31 - notes -expecting success: +checking known breakage: test_when_finished "rm -rf hgrepo gitrepo" && ( @@ -5867,12 +5860,14 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual - 2720dcc1d225199bf4d01db9957f92ce22cf058a ./sub_hg_a (heads/master) --752dc4a6ef66bfb8cff0c793ad62fa0746d9180d[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~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 ok 31 - notes -checking known breakage: +expecting success: test_when_finished "rm -rf hgrepo gitrepo" && ( @@ -5896,73 +5891,71 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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.5~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.5~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 679df7b5f0f5 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 2 changesets with 3 changes to 3 files +new changesets 2736d09cf903:2154ab6cdafd +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 0c671fbbbd6e +new changesets 2af726b6ba46 +Cloning into 'gitrepo'... progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master ca57653] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[master 4cc7c02] two +[master 454ba23] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.5~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.5~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'... /build/reproducible-path/git-remote-hg-1.0.5~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.5~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 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.5~ds/test/trash directory.main/tmp/hgrepo - 75cba3c..ca57653 master -> master -no changes found searching for changes +added 1 changesets with 1 changes to 1 files +new changesets 981b90b39050 adding changesets adding manifests adding file changes +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..4cc7c02 master -> master ---- expected 2026-10-30 21:38:36.533469326 +0000 -+++ actual 2026-10-30 21:38:36.989469326 +0000 +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + 80fd35b..454ba23 master -> master +[master 18393e5] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.5~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] +--- expected 2025-09-27 15:27:15.939384165 +0000 ++++ actual 2025-09-27 15:27:16.099385186 +0000 @@ -1,4 +1,3 @@ --115b138ba625b72ca92ac9e6dec24ec26bf5bbc4 +-fbb9bdbc760ac5fad06ec9d5d4fc71afaca88dd6 - 679df7b5f0f586c975653e4cd226c7ea0becf29b + 2af726b6ba46369ce8a5fccdb8ea449748efe625 -ok 32 - push updates notes +not ok 32 - push updates notes # TODO known breakage expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -5988,8 +5981,26 @@ check_bookmark hgrepo feature-a two -Cloning into 'gitrepo'... -not ok 32 - push updates notes # TODO known breakage +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets e8605e04ac9c +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..18393e5 master -> master +/build/reproducible-path/git-remote-hg-1.0.5~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 32 - push updates notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6015,62 +6026,96 @@ check_bookmark hgrepo feature-a two -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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. +Cloning into 'gitrepo'... +[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.5~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.5~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 + 484e91bb2ba02af7fd34f096b0c8c99e27a05b89 ./sub_hg_a (heads/master) +-169b1487f0001efc1047c0db84285a3873ecdb99[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) + 484e91bb2ba02af7fd34f096b0c8c99e27a05b89 ./sub_hg_a (heads/master) +-169b1487f0001efc1047c0db84285a3873ecdb99[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets dd1e4d5a5ecd +new changesets bcc92223e919 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 4342c9f] two +Cloning into 'gitrepo'... +[master de879e1] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..4342c9f master -> master +new changesets 694f1985eca3 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 52eba19] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~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 -new changesets 6eb89785db89 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master a731e6b] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + 29d684d..de879e1 master -> master ++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.5~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 +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.5~ds/test/trash directory.main-push/tmp/hgrepo - * [new branch] feature-a -> feature-a + fffffff..52eba19 master -> master /build/reproducible-path/git-remote-hg-1.0.5~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 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.5~ds/test/trash directory.main/tmp/hgrepo - e661b86..a731e6b master -> master + * [new branch] feature-a -> feature-a +/build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main-push/tmp/hgrepo + * [new branch] feature-a -> feature-a ok 33 - push bookmark without changesets expecting success: @@ -6093,16 +6138,6 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.5~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 -searching for changes -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - * [new branch] feature-a -> feature-a -Cloning into 'gitrepo'... ok 33 - push bookmark without changesets expecting success: @@ -6125,25 +6160,26 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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 16b1cbe11915 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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] +added 1 changesets with 1 changes to 1 files +new changesets ad6b1a81e9f8 WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +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 ecb122cff7a6 +new changesets ad6b1a81e9f8 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~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. @@ -6153,13 +6189,28 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets d3535fb94982 +new changesets 564ebd0f6348 progress revision 1 'default' (0/1) +/build/reproducible-path/git-remote-hg-1.0.5~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] From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - d5dd2e7..70846bc master -> origin/master - d5dd2e7..70846bc branches/default -> origin/branches/default + 6377655..20178ba master -> origin/master + 6377655..20178ba branches/default -> origin/branches/default * [new tag] v1.0 -> v1.0 -Updating d5dd2e7..70846bc +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 564ebd0f6348 +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + 6377655..20178ba master -> origin/master + 6377655..20178ba branches/default -> origin/branches/default + * [new tag] v1.0 -> v1.0 +Updating 6377655..20178ba Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -6199,24 +6250,7 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.5~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 -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 6bcb67bd2ce6 -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - 7b1c574..89c30be master -> origin/master - 7b1c574..89c30be branches/default -> origin/branches/default - * [new tag] v1.0 -> v1.0 -Updating 7b1c574..89c30be +Updating 6377655..20178ba Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -6256,17 +6290,37 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Cloning into 'gitrepo'... marked working directory as branch feature (branches are permanent and global, did you want a bookmark?) +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 +1 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.5~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 6594ea42a91a:f9838b01b91c +new changesets dee937d4bb82:3b02eb9ac3bb +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'feature' (0/1) +/build/reproducible-path/git-remote-hg-1.0.5~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 +Auto-merging content +Merge made by the 'ort' strategy. + content | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +adding changesets +adding manifests +adding file changes +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets dee937d4bb82:3b02eb9ac3bb progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) @@ -6276,7 +6330,6 @@ 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~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] -1 files updated, 0 files merged, 0 files removed, 0 files unresolved no changes found searching for changes adding changesets @@ -6284,8 +6337,19 @@ adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..0160ca7 master -> master -Cloning into 'gitrepo'... + fffffff..43cc386 master -> master +/build/reproducible-path/git-remote-hg-1.0.5~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 (-1 heads) +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + c425980..a3ec279 master -> master ok 35 - push merged named branch expecting success: @@ -6310,35 +6374,6 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.5~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 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 810033332ddd:cbffc06a8f0e -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.5~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 (-1 heads) -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - 3536b5b..0e86718 master -> master -Cloning into 'gitrepo'... ok 35 - push merged named branch expecting success: @@ -6363,19 +6398,36 @@ 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.5~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.5~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 +added 1 changesets with 1 changes to 1 files +new changesets c95e895ac064 +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 b3a95ca14a57 +new changesets c95e895ac064 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~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.5~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 no changes found -Cloning into 'gitrepo'... searching for changes adding changesets adding manifests @@ -6383,17 +6435,13 @@ added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo * [new tag] v1.0 -> v1.0 -/build/reproducible-path/git-remote-hg-1.0.5~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 b42aa28a9b11 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + * [new tag] v1.0 -> v1.0 ok 36 - light tag sets author expecting success: @@ -6423,18 +6471,6 @@ hg -R hgrepo log --template="{branch}\n" -r tip > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main/tmp/hgrepo - * [new tag] v1.0 -> v1.0 ok 36 - light tag sets author expecting success: @@ -6466,38 +6502,53 @@ marked working directory as branch feature (branches are permanent and global, did you want a bookmark?) +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) +Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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.5~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 31d327c3d0f9:7d09e308e76a +new changesets aec12a8973dd:92b00d99a14a +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'feature' (0/1) +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +new changesets aec12a8973dd:53a2cabb0177 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'feature' (0/1) -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) * master Switched to a new branch 'branches/feature' branch 'branches/feature' set up to track 'origin/branches/feature'. -Cloning into 'gitrepo'... +* master +Switched to a new branch 'branches/feature' +branch 'branches/feature' set up to track 'origin/branches/feature'. /build/reproducible-path/git-remote-hg-1.0.5~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.5~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 2 changes to 1 files -new changesets dab8ae3eb7d7:91784c059c1a +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + * [new tag] v1.0 -> v1.0 +/build/reproducible-path/git-remote-hg-1.0.5~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 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'feature' (0/1) searching for changes adding changesets adding manifests @@ -6505,9 +6556,6 @@ added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo * [new tag] v1.0 -> v1.0 -* master -Switched to a new branch 'branches/feature' -branch 'branches/feature' set up to track 'origin/branches/feature'. ok 37 - push tag different branch expecting success: @@ -6528,18 +6576,6 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo -/build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main/tmp/hgrepo - * [new tag] v1.0 -> v1.0 ok 37 - push tag different branch expecting success: @@ -6561,13 +6597,16 @@ check_files gitrepo Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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'... adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 1 files -new changesets da6a6cfb5889:0355f4704c66 +new changesets cecd1b4b55ef:9113681f0eb9 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 38 - cloning a removed file works @@ -6593,16 +6632,13 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file/test_file" -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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.5~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 added 2 changesets with 1 changes to 1 files -new changesets b3ce1ea891cb:d377486aa9cc +new changesets 0ff9a084a3f0:ad423f02ebd9 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 38 - cloning a removed file works @@ -6629,15 +6665,25 @@ check_files gitrepo "dir_or_file/test_file" Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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 0fa3d5c02fa2:551ee184cd2e +new changesets 0bfc99b51b36:c858cc709cd5 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.5~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 2 files +new changesets 561b592b4deb:2594b663f783 ok 39 - cloning a file replaced with a directory expecting success: @@ -6663,16 +6709,6 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file" -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~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 2 files -new changesets f83673f6bd5a:a4f4de2b68e0 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 39 - cloning a file replaced with a directory @@ -6707,7 +6743,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 90972b180856:fe291281f3fd +new changesets ec6f8ad6ffed:153e00ecc82a progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 40 - clone replace directory with a file @@ -6742,7 +6778,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets d21148cd862c:73e45efbcc81 +new changesets 25a482f8bd7d:c30f20a2a088 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 40 - clone replace directory with a file @@ -6771,16 +6807,17 @@ marked working directory as branch parent (branches are permanent and global, did you want a bookmark?) marked working directory as branch parent/child -Cloning into 'gitrepo'... marked working directory as branch parent (branches are permanent and global, did you want a bookmark?) +Cloning into 'gitrepo'... +marked working directory as branch parent/child /build/reproducible-path/git-remote-hg-1.0.5~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 1b4752eaf480:b1370050acad +new changesets 126e5a77d369:f6c038b2fa73 WARNING: Ignoring matched branch parent/child progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) @@ -6814,8 +6851,6 @@ test_cmp expected actual -marked working directory as branch parent/child -Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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] @@ -6825,7 +6860,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -new changesets 2ebe92ecda5b:caae1e251482 +new changesets 1a3deda20a45:b609f64cf10d WARNING: Ignoring matched branch parent/child progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) @@ -6859,13 +6894,14 @@ test_cmp expected actual +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~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 8b4a8dc7851b +new changesets 8c800c617207 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~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. @@ -6909,14 +6945,14 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 2e8eb99a0a77 +new changesets 475767653dfe progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -Cloning into 'gitrepo1'... /build/reproducible-path/git-remote-hg-1.0.5~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 'gitrepo1'... no changes found searching for changes adding changesets @@ -6929,11 +6965,6 @@ or locale.getdefaultlocale()[1] 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 42 - push annotated tag expecting success: @@ -6956,6 +6987,12 @@ git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && test_cmp expected actual +[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 +Cloning into 'gitrepo1'... /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -6966,28 +7003,27 @@ added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo * [new branch] master -> master -Cloning into 'gitrepo1'... Cloning into 'gitrepo2'... /build/reproducible-path/git-remote-hg-1.0.5~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.5~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: You appear to have cloned an empty repository. +/build/reproducible-path/git-remote-hg-1.0.5~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 +[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 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) -[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 43 - timezone issues with negative offsets expecting success: @@ -7049,7 +7085,7 @@ adding file changes adding remote bookmark feature-a added 1 changesets with 1 changes to 1 files -new changesets ba667be2fd96 +new changesets 32263bc82d6d progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~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. @@ -7096,10 +7132,10 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets c3321ede7962 +new changesets 67239c61f5a3 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 12f86fb] one +[master 9df36f4] one Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~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. @@ -7145,7 +7181,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 9c1493d30a90 +new changesets 83b43e346f1c progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -7165,19 +7201,19 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets 2457f9cb9a1d:7b531eb9d006 +new changesets cc898f64cb27:ed684c8ce886 progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - 29d41f9..92fd117 master -> origin/master - 29d41f9..92fd117 branches/default -> origin/branches/default -HEAD is now at 92fd117 restored + 635df74..31662c4 master -> origin/master + 635df74..31662c4 branches/default -> origin/branches/default +HEAD is now at 31662c4 restored /build/reproducible-path/git-remote-hg-1.0.5~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.5~ds/test/trash directory.main-push/tmp/hgrepo.second - ! [remote rejected] master -> master (rejected not pushing hg based commit 374805c4f143aa3c1c6491da1bfa7d1a560fae41) + ! [remote rejected] master -> master (rejected not pushing hg based commit d7ebcd6b5220e79b76dc6df52e24aeb9e6e94aea) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo.second' - ! [remote rejected] master -> master (rejected not pushing hg based commit 374805c4f143aa3c1c6491da1bfa7d1a560fae41) + ! [remote rejected] master -> master (rejected not pushing hg based commit d7ebcd6b5220e79b76dc6df52e24aeb9e6e94aea) ok 46 - check-hg-commits with fail mode expecting success: @@ -7201,23 +7237,23 @@ or locale.getdefaultlocale()[1] progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - 5eddeb5..876ccb7 master -> origin/master - 5eddeb5..876ccb7 branches/default -> origin/branches/default -HEAD is now at 876ccb7 restored + 8a31339..0b7c9cc master -> origin/master + 8a31339..0b7c9cc branches/default -> origin/branches/default +HEAD is now at 0b7c9cc restored /build/reproducible-path/git-remote-hg-1.0.5~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: Pushing hg changeset fe18e7fd3c00edae9c2130623400c3fce3951015 for 0b956f7eddd1faea02ca6213b79eaf68f684e87a -WARNING: Pushing hg changeset 6e5e4dbd39f2c1a2af9905eddb75d3d318b924df for a398326221f0b1eeadd05f9b6b56545e1273c542 -WARNING: Pushing hg changeset 1f19efa113d6c795b12a83854dcaf364f875323e for 8bb9c659efbca13daf7070725772aeb86bae18cd -WARNING: Pushing hg changeset a5b445364275fa6569603e48c335fcfcea7a96e2 for cda3a576a4f3093db3ab5a3009b3e1da41845e15 -WARNING: Pushing hg changeset dbb2e73dc39bbcb2ae5833143fa978b3b15fe594 for 876ccb72078026b56a8e860a4707b1dd899867d2 +WARNING: Pushing hg changeset 62bee1c2588d7e0db0be8580b4411a28892781e0 for 25fe1a2c6216f93f132d885aa5a0cad698ea96af +WARNING: Pushing hg changeset 253a57b245fa27e14ce8ea32f880b78870a9435a for b370a30cfcdc1fbf5505dc6077404d29fa928b8f +WARNING: Pushing hg changeset 8d251bc12f735a8688a0af269469f619158aa2fd for e046c2679e2bfe48b7de314460e2bc91bf0e224a +WARNING: Pushing hg changeset 9ae7ed0e5a0bfd59235c17d04e185eae8818c851 for a74e7d1a347ad2dcdf3ebe6a66b56113f4656a16 +WARNING: Pushing hg changeset a69b2c96c624f7859b9e477997e3276872fee761 for 0b7c9ccc8311f651c177b3e9a9c5b353f599a4e3 To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..876ccb7 master -> master -WARNING: Pushing hg changeset fe18e7fd3c00edae9c2130623400c3fce3951015 for 0b956f7eddd1faea02ca6213b79eaf68f684e87a -WARNING: Pushing hg changeset 6e5e4dbd39f2c1a2af9905eddb75d3d318b924df for a398326221f0b1eeadd05f9b6b56545e1273c542 -WARNING: Pushing hg changeset 1f19efa113d6c795b12a83854dcaf364f875323e for 8bb9c659efbca13daf7070725772aeb86bae18cd -WARNING: Pushing hg changeset a5b445364275fa6569603e48c335fcfcea7a96e2 for cda3a576a4f3093db3ab5a3009b3e1da41845e15 -WARNING: Pushing hg changeset dbb2e73dc39bbcb2ae5833143fa978b3b15fe594 for 876ccb72078026b56a8e860a4707b1dd899867d2 + fffffff..0b7c9cc master -> master +WARNING: Pushing hg changeset 62bee1c2588d7e0db0be8580b4411a28892781e0 for 25fe1a2c6216f93f132d885aa5a0cad698ea96af +WARNING: Pushing hg changeset 253a57b245fa27e14ce8ea32f880b78870a9435a for b370a30cfcdc1fbf5505dc6077404d29fa928b8f +WARNING: Pushing hg changeset 8d251bc12f735a8688a0af269469f619158aa2fd for e046c2679e2bfe48b7de314460e2bc91bf0e224a +WARNING: Pushing hg changeset 9ae7ed0e5a0bfd59235c17d04e185eae8818c851 for a74e7d1a347ad2dcdf3ebe6a66b56113f4656a16 +WARNING: Pushing hg changeset a69b2c96c624f7859b9e477997e3276872fee761 for 0b7c9ccc8311f651c177b3e9a9c5b353f599a4e3 ok 47 - check-hg-commits with push mode - no local proxy expecting success: @@ -7230,7 +7266,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets a15cf7aac83a +new changesets 397393ef3217 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -7250,32 +7286,32 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets a7184cd51d76:8bf7558fd5b0 +new changesets 8b385f07e103:44924c9715c8 progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - 2bf7213..8cd42da master -> origin/master - 2bf7213..8cd42da branches/default -> origin/branches/default -HEAD is now at 8cd42da restored + 4a14736..375c48b master -> origin/master + 4a14736..375c48b branches/default -> origin/branches/default +HEAD is now at 375c48b restored /build/reproducible-path/git-remote-hg-1.0.5~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: Using hg changeset a7184cd51d76dfdb50f72d27f14788f7094454b5 for d681263fed61153f29894568e01d7221af4488b4 -WARNING: Using hg changeset 397cac2ce4555f3dcc62b75067198bd8e4b2b3f0 for 6ff0fc1bf0023ad36311767f848ada9c858c7b38 -WARNING: Using hg changeset 92fd802d85945541780e2fe2b7c2e45dd92ac2ed for 5cc2b4c2cc10124c1dc070c9ddb5bd1533210f39 -WARNING: Using hg changeset ada0d16a4cfda5d2b88c91b10c828a88129ff6cd for 7b7f03e63efebff75a011b7b40fafe1e9691132f -WARNING: Using hg changeset 8bf7558fd5b0ebb313d361f58c39d3e4388fb044 for 8cd42daddd2beb8ee9e2a74922bd72c3f4beca16 +WARNING: Using hg changeset 8b385f07e103900b993c63002dd2fe9dab3e7217 for d2ed23f5c35ad603fbd0a09f7b6dc857217fa590 +WARNING: Using hg changeset b84cd7c877e217cd24bbf5535162b7ff4281421b for 22854d9f41097cd020e4b1d8aa61d1953eda220f +WARNING: Using hg changeset 48beaaa752a52aaeeeffd489bd6524f318758adc for c491abaa47f354d7f74c51aec0189489d5f3cbb7 +WARNING: Using hg changeset 104443999954634c1557b409c06407f9799616c7 for ffaa610146a36e59d6736cae81d9e35be805966c +WARNING: Using hg changeset 44924c9715c8e874d90c681230b4b25ee0a8c51b for 375c48b171cbf934ab868d6e7f402c7736e841cb 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.5~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..8cd42da master -> master -WARNING: Using hg changeset a7184cd51d76dfdb50f72d27f14788f7094454b5 for d681263fed61153f29894568e01d7221af4488b4 -WARNING: Using hg changeset 397cac2ce4555f3dcc62b75067198bd8e4b2b3f0 for 6ff0fc1bf0023ad36311767f848ada9c858c7b38 -WARNING: Using hg changeset 92fd802d85945541780e2fe2b7c2e45dd92ac2ed for 5cc2b4c2cc10124c1dc070c9ddb5bd1533210f39 -WARNING: Using hg changeset ada0d16a4cfda5d2b88c91b10c828a88129ff6cd for 7b7f03e63efebff75a011b7b40fafe1e9691132f -WARNING: Using hg changeset 8bf7558fd5b0ebb313d361f58c39d3e4388fb044 for 8cd42daddd2beb8ee9e2a74922bd72c3f4beca16 + fffffff..375c48b master -> master +WARNING: Using hg changeset 8b385f07e103900b993c63002dd2fe9dab3e7217 for d2ed23f5c35ad603fbd0a09f7b6dc857217fa590 +WARNING: Using hg changeset b84cd7c877e217cd24bbf5535162b7ff4281421b for 22854d9f41097cd020e4b1d8aa61d1953eda220f +WARNING: Using hg changeset 48beaaa752a52aaeeeffd489bd6524f318758adc for c491abaa47f354d7f74c51aec0189489d5f3cbb7 +WARNING: Using hg changeset 104443999954634c1557b409c06407f9799616c7 for ffaa610146a36e59d6736cae81d9e35be805966c +WARNING: Using hg changeset 44924c9715c8e874d90c681230b4b25ee0a8c51b for 375c48b171cbf934ab868d6e7f402c7736e841cb ok 48 - check-hg-commits with push mode - with local proxy expecting success: @@ -7297,7 +7333,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets e125ffd3ce48 +new changesets f2ff5048b029 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~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. @@ -7307,23 +7343,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:44 . -drwxr-xr-x 8 pbuilder1 pbuilder1 280 Oct 30 21:44 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:44 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Oct 30 21:44 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Oct 30 21:44 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 . +drwxr-xr-x 8 pbuilder2 pbuilder2 280 Sep 27 15:35 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Sep 27 15:35 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Sep 27 15:35 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:44 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Oct 30 21:44 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 27 15:35 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:44 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Oct 30 21:44 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 27 15:35 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 refs ok 49 - shared-marks unset expecting success: @@ -7355,7 +7391,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 80853c869572 +new changesets b8776ff6d39d progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~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. @@ -7365,23 +7401,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:44 . -drwxr-xr-x 8 pbuilder1 pbuilder1 280 Oct 30 21:44 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:44 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Oct 30 21:44 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Oct 30 21:44 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 . +drwxr-xr-x 8 pbuilder2 pbuilder2 280 Sep 27 15:35 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Sep 27 15:35 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Sep 27 15:35 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:44 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Oct 30 21:44 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 27 15:35 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:44 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Oct 30 21:44 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 27 15:35 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 refs /build/reproducible-path/git-remote-hg-1.0.5~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 @@ -7403,25 +7439,25 @@ progress revision walk 'branches/default' (0/0) progress revision 0 'default' (0/1) total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Oct 30 21:44 . -drwxr-xr-x 8 pbuilder1 pbuilder1 280 Oct 30 21:44 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:44 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Oct 30 21:44 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Oct 30 21:44 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Sep 27 15:35 . +drwxr-xr-x 8 pbuilder2 pbuilder2 280 Sep 27 15:35 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Sep 27 15:35 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Sep 27 15:35 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Oct 30 21:44 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Oct 30 21:44 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Oct 30 21:44 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Oct 30 21:44 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Oct 30 21:44 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Sep 27 15:35 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Sep 27 15:35 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 27 15:35 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Sep 27 15:35 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Sep 27 15:35 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Oct 30 21:44 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Oct 30 21:44 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Oct 30 21:44 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Oct 30 21:44 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Oct 30 21:44 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Sep 27 15:35 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Sep 27 15:35 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 27 15:35 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Sep 27 15:35 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Sep 27 15:35 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 refs ok 50 - shared-marks set to unset expecting success: @@ -7462,7 +7498,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 563c2b8e3870 +new changesets 30b309aef151 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~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. @@ -7474,70 +7510,70 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Oct 30 21:44 . -drwxr-xr-x 8 pbuilder1 pbuilder1 280 Oct 30 21:44 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:44 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Oct 30 21:44 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Oct 30 21:44 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Sep 27 15:35 . +drwxr-xr-x 8 pbuilder2 pbuilder2 280 Sep 27 15:35 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Sep 27 15:35 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Sep 27 15:35 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Oct 30 21:44 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Oct 30 21:44 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Oct 30 21:44 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Oct 30 21:44 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Oct 30 21:44 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Sep 27 15:35 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Sep 27 15:35 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 27 15:35 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Sep 27 15:35 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Sep 27 15:35 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Oct 30 21:44 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Oct 30 21:44 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Oct 30 21:44 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Oct 30 21:44 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Oct 30 21:44 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Sep 27 15:35 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Sep 27 15:35 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 27 15:35 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Sep 27 15:35 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Sep 27 15:35 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 refs /build/reproducible-path/git-remote-hg-1.0.5~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 Oct 30 21:44 . -drwxr-xr-x 8 pbuilder1 pbuilder1 280 Oct 30 21:44 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:44 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Oct 30 21:45 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Oct 30 21:44 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Sep 27 15:35 . +drwxr-xr-x 8 pbuilder2 pbuilder2 280 Sep 27 15:35 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Sep 27 15:35 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Sep 27 15:35 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Oct 30 21:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Oct 30 21:44 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Oct 30 21:44 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Oct 30 21:45 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Oct 30 21:45 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Sep 27 15:35 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Sep 27 15:35 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 27 15:35 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Sep 27 15:35 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Sep 27 15:35 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Oct 30 21:44 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Oct 30 21:44 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Oct 30 21:44 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Oct 30 21:44 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Oct 30 21:44 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Sep 27 15:35 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Sep 27 15:35 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 27 15:35 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Sep 27 15:35 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Sep 27 15:35 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 refs /build/reproducible-path/git-remote-hg-1.0.5~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 Oct 30 21:45 . -drwxr-xr-x 8 pbuilder1 pbuilder1 280 Oct 30 21:44 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:44 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Oct 30 21:45 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Oct 30 21:45 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:45 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:45 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 . +drwxr-xr-x 8 pbuilder2 pbuilder2 280 Sep 27 15:35 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Sep 27 15:35 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Sep 27 15:35 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Oct 30 21:44 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 27 15:35 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:45 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Oct 30 21:45 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Oct 30 21:44 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Oct 30 21:44 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Sep 27 15:35 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 27 15:35 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Sep 27 15:35 refs ok 51 - shared-marks unset to set expecting success: @@ -7586,7 +7622,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 52 - push with renamed executable preserves executable bit expecting success: @@ -7717,12 +7753,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/1268617/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/1268617/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/17129 and its subdirectories -I: Current time: Fri Oct 30 09:45:09 -12 2026 -I: pbuilder-time-stamp: 1793396709 +I: removing directory /srv/workspace/pbuilder/1268617 and its subdirectories +I: Current time: Sun Sep 28 05:35:34 +14 2025 +I: pbuilder-time-stamp: 1758987334