Diff of the two buildlogs: -- --- b1/build.log 2025-09-25 01:35:45.642770300 +0000 +++ b2/build.log 2025-09-25 01:38:58.439014126 +0000 @@ -1,7 +1,7 @@ W: cgroups are not available on the host, not using them. I: pbuilder: network access will be disabled during build -I: Current time: Wed Sep 24 13:32:24 -12 2025 -I: pbuilder-time-stamp: 1758763944 +I: Current time: Wed Oct 28 21:58:47 +14 2026 +I: pbuilder-time-stamp: 1793174327 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz] I: copying local configuration @@ -25,52 +25,84 @@ 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/2903345/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/645059/tmp/hooks/D01_modify_environment starting +debug: Running on codethink03-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 Oct 28 07:59 /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/645059/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/645059/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='unstable' - HOME='/root' - HOST_ARCH='arm64' + DIRSTACK=() + DISTRIBUTION=unstable + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=aarch64 + HOST_ARCH=arm64 IFS=' ' - 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='2903345' - PS1='# ' - PS2='> ' + 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=645059 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.0JnWhrKa/pbuilderrc_mKZK --distribution unstable --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.0JnWhrKa/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/sbin/chroot' - 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.0JnWhrKa/pbuilderrc_V94a --distribution unstable --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.0JnWhrKa/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 codethink04-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 12:30 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/2903345/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Aug 10 2025 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/645059/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 unstable/main arm64 sharness all 1.0.0-1.1 [28.6 kB] Get: 110 http://deb.debian.org/debian unstable/main arm64 xsltproc arm64 1.1.43-0.2 [43.5 kB] Get: 111 http://deb.debian.org/debian unstable/main arm64 xmlto arm64 0.0.29-2 [27.3 kB] -Fetched 49.8 MB in 0s (105 MB/s) +Fetched 49.8 MB in 0s (179 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: Thu Sep 25 01:32:48 UTC 2025. -Universal Time is now: Thu Sep 25 01:32:48 UTC 2025. +Local time is now: Wed Oct 28 07:59:12 UTC 2026. +Universal Time is now: Wed Oct 28 07:59:12 UTC 2026. 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/645059/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for unstable +I: user script /srv/workspace/pbuilder/645059/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 @@ -792,15 +828,6 @@ grep origin help 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*" && ( @@ -836,6 +863,24 @@ test_cmp expected actual +expecting success: + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) + +expecting success: + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) + [master (root-commit) 79c6ce2] add älphà Author: A U Thor 1 file changed, 1 insertion(+) @@ -848,15 +893,6 @@ Author: tést èncödîng 1 file changed, 1 insertion(+) create mode 100644 gamma -expecting success: - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - ) - [master 3b0b48f] add déltà Author: tést èncödîng 1 file changed, 1 insertion(+) @@ -886,33 +922,33 @@ 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] /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] -/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 de9efb0084e8 +new changesets 6c728cf8d423 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 de9efb0084e8 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +new changesets 6c728cf8d423 adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets de9efb0084e8 +new changesets 6c728cf8d423 +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 2 - cloning @@ -949,10 +985,10 @@ 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 +marked working directory as branch next +(branches are permanent and global, did you want a bookmark?) adding file changes added 4 changesets with 4 changes to 4 files new changesets 1e3e49d2cc8f:6674f1c866b5 @@ -982,34 +1018,37 @@ 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 +/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 2 changes to 1 files -new changesets de9efb0084e8:ff6b9ee4c426 -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-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] adding changesets +added 2 changesets with 2 changes to 1 files +new changesets 6c728cf8d423:dec8a4d663ca adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets de9efb0084e8:ff6b9ee4c426 -searching for changes -no changes found +new changesets 6c728cf8d423:dec8a4d663ca +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'next' (0/1) progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/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 -adding changesets expecting success: test_when_finished "rm -rf gitrepo*" && @@ -1024,9 +1063,6 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/feature-a feature-a -adding manifests -adding file changes -added 4 changesets with 4 changes to 4 files ok 3 - cloning with branches expecting success: @@ -1050,9 +1086,27 @@ or locale.getdefaultlocale()[1] 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] +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +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: @@ -1086,7 +1140,6 @@ test_cmp expected actual -Cloning into 'gitrepo'... [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) @@ -1095,32 +1148,11 @@ Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 beta -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 - -/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] [master 86bf00d] add foo Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 foo/bar rm 'alpha' -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways [master 74dc957] remove alpha Author: A U Thor 1 file changed, 1 deletion(-) @@ -1130,17 +1162,30 @@ Author: A U Thor 1 file changed, 1 deletion(-) delete mode 100644 foo/bar +/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 adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets de9efb0084e8:783378954d0a +new changesets 6c728cf8d423:b57a8f85d8f4 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'next' (0/1) +adding changesets +adding manifests +adding file changes +adding remote bookmark feature-a +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets 6c728cf8d423:b57a8f85d8f4 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-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 4 - cloning with bookmarks expecting success: @@ -1162,15 +1207,6 @@ check_bookmark hgrepo devel devel -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 de9efb0084e8:783378954d0a -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'next' (0/1) ok 4 - cloning with bookmarks expecting success: @@ -1194,7 +1230,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] -Cloning into 'gitrepo'... no changes found searching for changes adding changesets @@ -1203,76 +1238,77 @@ added 5 changesets with 3 changes to 3 files Cloning into 'gitrepo'... Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.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 adding remote bookmark devel adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets de9efb0084e8:783378954d0a +new changesets 6c728cf8d423:b57a8f85d8f4 +/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/2) progress revision 1 'next' (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] 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 de9efb0084e8:783378954d0a +new changesets 6c728cf8d423:b57a8f85d8f4 progress revision walk 'bookmarks/master' (2/2) -[devel c59c484] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) 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-remote-hg: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 441ac4d2fa3a +new changesets 3aecf57c267a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel c59c484] devel +[devel 9b9a0dd] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[devel 9b9a0dd] 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 /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 adding changesets adding manifests -searching for changes -adding changesets -adding manifests -adding file changes adding file changes added 5 changesets with 3 changes to 3 files new changesets 362b656574c3:54f595cbdf1f -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] progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/5) +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] +/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] +no changes found no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -/build/reproducible-path/git-remote-hg-1.0.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 1 changesets with 1 changes to 1 files ok 3 - subcommand repo - with local proxy expecting success: @@ -1327,10 +1363,6 @@ 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.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways searching for changes no changes found searching for changes @@ -1338,94 +1370,68 @@ 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.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 adding remote bookmark devel adding remote bookmark feature-a added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets de9efb0084e8:b55b2070608b -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/3) -progress revision 1 'next' (0/1) -/build/reproducible-path/git-remote-hg-1.0.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] +new changesets 6c728cf8d423:b823f815ca71 adding changesets adding manifests adding file changes adding remote bookmark devel adding remote bookmark feature-a added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets de9efb0084e8:b55b2070608b +new changesets 6c728cf8d423:b823f815ca71 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -[feature-b 9f913fe] feature-b +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/3) +progress revision 1 'next' (0/1) +[feature-b e9eef25] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... -[feature-b 9f913fe] feature-b +[feature-b e9eef25] 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.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 -/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. +new changesets 95f15b791a62 +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] +no changes found +searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets d028fd39f6db no changes found -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) 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: - test_when_finished "rm -rf hgrepo gitrepo" && - - ( - hg init hgrepo && - cd hgrepo && - - touch content && - hg add content && - - > ../expected && - author_test alpha "" "H G Wells " && - author_test beta "beta" "beta " && - author_test gamma "gamma (comment)" "gamma " && - author_test delta "" "Unknown " && - author_test epsilon "epsilon" "epsilon " && - author_test zeta "zeta " && - author_test eta " eta " "eta " && - author_test theta "theta < test@example.com >" "theta " && - author_test iota "iota >test@example.com>" "iota " && - author_test kappa "kappa < test example com>" "kappa " && - author_test lambda "lambda@example.com" "Unknown " && - author_test mu "mu.mu@example.com" "Unknown " - ) && - - git clone "hg::hgrepo" gitrepo && - git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual && - - test_cmp expected actual - +/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 - file removal expecting success: @@ -1495,6 +1501,38 @@ test_cmp expected actual +ok 6 - new bookmark + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + hg init hgrepo && + cd hgrepo && + + touch content && + hg add content && + + > ../expected && + author_test alpha "" "H G Wells " && + author_test beta "beta" "beta " && + author_test gamma "gamma (comment)" "gamma " && + author_test delta "" "Unknown " && + author_test epsilon "epsilon" "epsilon " && + author_test zeta "zeta " && + author_test eta " eta " "eta " && + author_test theta "theta < test@example.com >" "theta " && + author_test iota "iota >test@example.com>" "iota " && + author_test kappa "kappa < test example com>" "kappa " && + author_test lambda "lambda@example.com" "Unknown " && + author_test mu "mu.mu@example.com" "Unknown " + ) && + + git clone "hg::hgrepo" gitrepo && + git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual && + + test_cmp expected actual + /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. @@ -1509,14 +1547,10 @@ 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] -/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 ... -/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] -cfd3f02dcb122d50675f4b2e06b94b6ff90fce36 d028fd39f6db55b7dfd920a1b538d509f7dd455f +9fcbe5d4b0d0ba33b0c34e38cd4c7b7698ce650e 95f15b791a62f90ff0c71ca80dcb08084f6ba7fb ok 4 - subcommands hg-rev and git-rev and mapfile expecting success: @@ -1556,6 +1590,8 @@ grep "git marks" output ) +/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 @@ -1573,6 +1609,15 @@ 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 e6515a11b258:608110106f22 +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/4) ok 3 - git tags expecting success: @@ -1611,15 +1656,8 @@ 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 a4aded3ca291:64c15ffd4517 -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/4e2245dff81c-e9eab242-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 @@ -1629,9 +1667,25 @@ adding file changes added 1 changesets with 1 changes to 1 files 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.helper/hgrepo/.hg/strip-backup/218865adcf77-77185fe1-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 1 changesets with 1 changes to 1 files (+1 heads) +new changesets 123d667e0730 +progress revision 4 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo + + 392e49a...5de88dc master -> origin/master (forced update) + + 392e49a...5de88dc branches/default -> origin/branches/default (forced update) +HEAD is now at 5de88dc four +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] +/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 @@ -1639,23 +1693,56 @@ adding changesets adding manifests adding file 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] added 12 changesets with 12 changes to 1 files -new changesets 79f52bbafd5e:79dcfdcbcf6a -progress revision walk 'bookmarks/master' (11/11) -progress revision 0 'master' (0/12) -searching for changes -Cloning into 'gitrepo'... +new changesets 78765cc811b7:c0e952ad1c66 adding changesets adding manifests +Loading hg marks ... +Loading git marks ... +Performing garbage collection on git commits ... +Computing marks intersection ... +Including notes commits ... +Trimmed hg marks from #5 down to #0 +Trimmed git marks from #12 down to #2 +Writing hg marks ... +Writing git marks ... +Loading hg marks ... +Trimmed hg marks from #5 down to #0 +Writing hg marks ... adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets fd04610c85bf -progress revision 4 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - + 68498b6...452fb59 master -> origin/master (forced update) - + 68498b6...452fb59 branches/default -> origin/branches/default (forced update) +progress revision walk 'bookmarks/master' (11/11) +progress revision 0 'master' (0/12) +Loading git marks ... +Trimmed git marks from #12 down to #2 +Writing git marks ... +ok 5 - subcommand gc + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repos && + + ( + cd hgrepo && + echo one > content && + hg commit -m one + ) && + + ( + cd gitrepo && + git fetch origin + ) && + + hg log -R hgrepo > expected && + # not inside gitrepo; test shared path handling + GIT_DIR=gitrepo/.git git-hg-helper origin log > actual + + test_cmp expected actual + +added 12 changesets with 12 changes to 1 files +new changesets 78765cc811b7:c0e952ad1c66 +progress revision walk 'bookmarks/master' (11/11) +progress revision 0 'master' (0/12) ok 7 - authors expecting success: @@ -1695,18 +1782,6 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected -HEAD is now at 452fb59 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. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 12 changesets with 12 changes to 1 files -new changesets 79f52bbafd5e:0064f881d74b -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. - or locale.getdefaultlocale()[1] ok 7 - authors expecting success: @@ -1747,48 +1822,20 @@ test_cmp actual expected marked working directory as branch gamma -Loading hg marks ... -Loading git marks ... -Performing garbage collection on git commits ... -Computing marks intersection ... -Including notes commits ... -Trimmed hg marks from #5 down to #0 -Trimmed git marks from #12 down to #2 -Writing hg marks ... -Writing git marks ... -Loading hg marks ... -Trimmed hg marks from #5 down to #0 -Writing hg marks ... -Loading git marks ... -Trimmed git marks from #12 down to #2 -Writing git marks ... -ok 5 - subcommand gc - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repos && - - ( - cd hgrepo && - echo one > content && - hg commit -m one - ) && - - ( - cd gitrepo && - git fetch origin - ) && - - hg log -R hgrepo > expected && - # not inside gitrepo; test shared path handling - GIT_DIR=gitrepo/.git git-hg-helper origin log > actual - - test_cmp expected actual - +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 0119e4e9b389 +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'... +Cloning into 'gitrepo'... searching for changes adding changesets adding manifests @@ -1799,39 +1846,42 @@ 1 local changesets published progress revision 1 'default' (0/1) progress revision 2 'gamma' (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] -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 50c53c545e11:ee5658b2e09f +new changesets d7bc80e52d03:cfece73054f3 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +new changesets d7bc80e52d03:a9d1c6a4c0e7 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-remote-hg: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 747797eb572d -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] +new changesets 88257ea0d681 +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo + fff015a..15a26f3 master -> origin/master + fff015a..15a26f3 branches/default -> origin/branches/default /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 2 changes to 1 files -new changesets 50c53c545e11:b3878c720d32 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/cfece73054f3-248e5918-backup.hg searching for changes no changes found searching for changes @@ -1841,28 +1891,18 @@ added 2 changesets with 2 changes to 2 files searching for changes adding changesets +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/a9d1c6a4c0e7-5a3140fd-backup.hg adding manifests adding file changes added 1 changesets with 0 changes to 0 files -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/ee5658b2e09f-7a9aa736-backup.hg 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-push/hgrepo/.hg/strip-backup/b3878c720d32-16d864b0-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. +/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] 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets d42b047a46fa -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - ba6252a..18e4901 master -> origin/master - ba6252a..18e4901 branches/default -> origin/branches/default +/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 @@ -1872,11 +1912,55 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets 973492410177:9c575ef64cd6 +new changesets b2172c547cc0:4451dd086703 +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 + +progress revision 2 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo + + 6b916e3...32aa271 master -> origin/master (forced update) + + 6b916e3...32aa271 branches/default -> origin/branches/default (forced update) +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files (+1 heads) +new changesets b2172c547cc0:4451dd086703 progress revision 2 'default' (0/2) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo - + e13013b...629951a master -> origin/master (forced update) - + e13013b...629951a branches/default -> origin/branches/default (forced update) + + 57f2e2b...32aa271 master -> origin/master (forced update) + + 57f2e2b...32aa271 branches/default -> origin/branches/default (forced update) ok 4 - hg branch expecting success: @@ -1914,20 +1998,6 @@ Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha -/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 973492410177:9c575ef64cd6 -progress revision 2 'default' (0/2) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo - + 78de007...629951a master -> origin/master (forced update) - + 78de007...629951a branches/default -> origin/branches/default (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] ok 8 - strip expecting success: @@ -1964,40 +2034,6 @@ 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: @@ -2037,6 +2073,7 @@ 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] +warning: possible case-folding collision for .git no changes found searching for changes adding changesets @@ -2045,7 +2082,17 @@ added 1 changesets with 1 changes to 1 files searching for changes Cloning into 'gitrepo'... -warning: possible case-folding collision for .git +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 383a74416392 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +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 @@ -2054,27 +2101,29 @@ adding manifests adding file changes added 1 changesets with 3 changes to 3 files -new changesets 4b31d5ed5f46 +new changesets aec54b1a1c86 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... -[master 0fc5bb7] one +[master 31ce872] one + Author: A U Thor + 2 files changed, 2 insertions(+), 2 deletions(-) +[master 042ebaf] one Author: A U Thor 2 files changed, 2 insertions(+), 2 deletions(-) -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] +no changes found +searching for changes adding changesets -/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 3 changes to 3 files -new changesets 4b31d5ed5f46 +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..31ce872 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 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) no changes found searching for changes adding changesets @@ -2082,10 +2131,7 @@ 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 - ed7550b..0fc5bb7 master -> master -[master 0fc5bb7] one - Author: A U Thor - 2 files changed, 2 insertions(+), 2 deletions(-) + 7c725bd..042ebaf 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] searching for changes @@ -2097,10 +2143,12 @@ new changesets 16869bbe54be 1 local changesets published progress revision 1 'default' (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] 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -no changes found +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 9 - dotfiles expecting success: @@ -2127,13 +2175,6 @@ check_branch hgrepo default two -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..0fc5bb7 master -> master 2 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 9 - dotfiles @@ -2161,6 +2202,7 @@ check_branch hgrepo default two +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 @@ -2178,13 +2220,18 @@ * [new branch] not-master -> not-master ! [rejected] alpha -> alpha (already exists) error: failed to push some refs to 'hg::../hgrepo2' -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 hint: Updates were rejected because the tag already exists in the remote. -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 53dc68655025:fb6dc86026f2 +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] ok 5 - hg tags expecting success: @@ -2224,11 +2271,13 @@ test_cmp expected actual +Cloning into 'gitrepo'... [master (root-commit) a663549] add alpha Author: A U Thor Date: Mon Jan 1 00:00:00 2007 +0000 1 file changed, 1 insertion(+) create mode 100644 alpha +Cloning into './sub_hg_a'... [master ea3e397] add beta Author: A U Thor Date: Mon Jan 1 00:00:00 2007 +0100 @@ -2239,7 +2288,6 @@ Date: Mon Jan 1 00:00:00 2007 -0100 1 file changed, 1 insertion(+) create mode 100644 gamma -Cloning into 'gitrepo'... [master 79cd3e4] add delta Author: A U Thor Date: Mon Jan 1 00:00:00 2007 +0130 @@ -2250,15 +2298,26 @@ Date: Mon Jan 1 00:00:00 2007 -0130 1 file changed, 1 insertion(+) create mode 100644 epsilon +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.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 changesets adding file changes -added 2 changesets with 3 changes to 3 files -new changesets b26d9b0560a0:f84cb9e545c8 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +adding manifests +adding file changes +adding remote bookmark master +added 2 changesets with 2 changes to 1 files +new changesets 15af854ed305:2ab234353fad +added 1 changesets with 1 changes to 1 files +new changesets 8ea622df194c +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +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.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 @@ -2268,14 +2327,17 @@ adding file changes adding remote bookmark master added 2 changesets with 2 changes to 1 files -new changesets 2664f0218ffe:0f34f459f8d5 +new changesets 15af854ed305:2ab234353fad +[default dde0f8e] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) progress revision walk 'bookmarks/default' (1/1) progress revision 0 'default' (0/2) -Cloning into 'gitrepo'... +Cloning into './sub_hg_b'... /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 -[default d2f202f] two +[default dde0f8e] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) searching for changes @@ -2283,49 +2345,64 @@ adding manifests adding file changes added 5 changesets with 5 changes to 5 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] /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'... -adding changesets -adding manifests -adding file changes -adding remote bookmark master -added 2 changesets with 2 changes to 1 files -new changesets 2664f0218ffe:a777e4810987 -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.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 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 - 2fba821..d2f202f default -> default -[default 22be799] 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] +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo + fffffff..dde0f8e default -> default adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 1dc38cc28c94 +new changesets 1dad8ebccdbe +/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' (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] -Cloning into './sub_hg_b'... -/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] +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 + 61165d0..dde0f8e default -> default +Cloning into './sub_git'... +done. +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 + ok 10 - remote push with master bookmark expecting success: @@ -2349,36 +2426,15 @@ check_branch hgrepo default one -searching for changes -adding changesets -adding manifests -adding file changes +/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 -added 1 changesets with 1 changes to 1 files adding file changes added 5 changesets with 5 changes to 5 files new changesets 87c8f82b00d0:21e96c99dac4 -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo - fffffff..22be799 default -> default progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/5) -/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 -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/gitrepo/.git/ -added 1 changesets with 1 changes to 1 files -new changesets 5203d5748195 -[master (root-commit) 64caca5] one - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_git'... -done. ok 10 - remote push with master bookmark expecting success: @@ -2402,38 +2458,19 @@ check_branch hgrepo default one -/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. +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(+) + create mode 100644 content +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. 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 -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.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 @@ -2441,34 +2478,39 @@ 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. + 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] +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 5 changes to 5 files -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(+) - 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. - or locale.getdefaultlocale()[1] -no changes found -changeset: 0:6e2126489d3d -tag: tip -user: A U Thor -date: Mon Jan 01 00:00:00 2007 +0230 -summary: one - searching for changes +added 5 changesets with 5 changes to 5 files adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files To hg::../hgrepo * [new branch] master -> master +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 + ok 11 - remote push from master branch expecting success: @@ -2485,16 +2527,6 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero -changeset: 0:6e2126489d3d -tag: tip -user: A U Thor -date: Mon Jan 01 00:00:00 2007 +0230 -summary: one - -ok 6 - test timezones - -# passed all 6 test(s) -1..6 ok 11 - remote push from master branch expecting success: @@ -2511,8 +2543,14 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero +ok 6 - test timezones + +# passed all 6 test(s) +1..6 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 @@ -2521,7 +2559,14 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 72bdf4f3dc73 +new changesets bc907dee0831 +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 bc907dee0831 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 12 - remote cloning @@ -2537,19 +2582,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] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 72bdf4f3dc73 -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 ok 12 - remote cloning expecting success: @@ -2563,26 +2595,33 @@ ) 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 72bdf4f3dc73 -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] adding changesets +added 1 changesets with 1 changes to 1 files adding manifests +new changesets bc907dee0831 adding file changes added 1 changesets with 1 changes to 1 files -new changesets 72bdf4f3dc73 +new changesets bc907dee0831 +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) /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 no changes found ok 13 - moving remote clone @@ -2605,10 +2644,7 @@ check_bookmark hgrepo devel devel -/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 '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/ ok 13 - moving remote clone expecting success: @@ -2630,58 +2666,61 @@ check_bookmark hgrepo devel devel -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] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.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 devel added 1 changesets with 1 changes to 1 files -new changesets 72bdf4f3dc73 +new changesets bc907dee0831 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel 40bf18b] 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. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes adding remote bookmark devel added 1 changesets with 1 changes to 1 files -new changesets 72bdf4f3dc73 +new changesets bc907dee0831 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +[devel 81fcbbb] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[devel 81fcbbb] 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 -[devel 40bf18b] 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. + 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-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 +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] ok 14 - remote update bookmark expecting success: @@ -2699,7 +2738,6 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -Cloning into 'gitrepo'... ok 14 - remote update bookmark expecting success: @@ -2717,8 +2755,17 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 75dbbdf6874d:3f05ecd260d3 +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] +/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 @@ -2726,64 +2773,54 @@ adding file changes adding remote bookmark devel added 2 changesets with 2 changes to 1 files -new changesets 72bdf4f3dc73:c0625d54b6b6 -/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) +new changesets bc907dee0831:95a74c858a91 adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 26ae09f09b47:972a286d39a4 +adding remote bookmark devel +added 2 changesets with 2 changes to 1 files +new changesets bc907dee0831:95a74c858a91 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -[feature-b 5a8c981] feature-b +/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'... +[feature-b 5d5f5d6] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[feature-b 5d5f5d6] 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-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] adding changesets adding manifests adding file changes -adding remote bookmark devel -added 2 changesets with 2 changes to 1 files -new changesets 72bdf4f3dc73:c0625d54b6b6 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -[feature-b 5a8c981] 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 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] +added 2 changesets with 3 changes to 3 files +new changesets f77a3056e05e:fc2f285f627e +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +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 -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] -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-remote-hg: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 3598742e657e:840132cb1b72 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +Cloning into './sub_hg_a/sub_hg_a_x'... ok 15 - remote new bookmark expecting success: @@ -2810,7 +2847,6 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... -Cloning into './sub_hg_a/sub_hg_a_x'... ok 15 - remote new bookmark expecting success: @@ -2837,59 +2873,56 @@ check_branch hgrepo default bump 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 e90da74fef99 +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] adding changesets adding manifests adding file changes adding remote bookmark devel adding remote bookmark feature-b added 3 changesets with 3 changes to 1 files -new changesets 72bdf4f3dc73:d794f2e1e081 +new changesets bc907dee0831:c76c77566317 +Cloning into './sub_hg_b'... 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] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 15c105e4e3ec -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] adding changesets adding manifests adding file changes adding remote bookmark devel adding remote bookmark feature-b added 3 changesets with 3 changes to 1 files -new changesets 72bdf4f3dc73:d794f2e1e081 +new changesets bc907dee0831:c76c77566317 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) -Cloning into './sub_hg_b'... -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(leaving bookmark devel) /build/reproducible-path/git-remote-hg-1.0.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 +(leaving bookmark devel) adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 55d9d6292348:71e05779ed6f -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(leaving bookmark devel) +new changesets ca9c9e5363c5:2b754f655655 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -[master c4361e9] diverged - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(leaving bookmark devel) Cloning into './sub_hg_b/sub_git'... done. -[master c4361e9] diverged +[master 8c21827] diverged Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) ok 8 - subcommand sub initial recursive update @@ -2899,6 +2932,9 @@ test_sub_update +[master 8c21827] 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 +2944,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets add0182ba53b +new changesets 399353c6f5af 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' @@ -2924,7 +2960,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets add0182ba53b +new changesets f8932777a8b0 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 +3000,6 @@ check_bookmark hgrepo diverge "bump bookmark" -1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 16 - remote push diverged expecting success: @@ -2997,6 +3032,7 @@ check_bookmark hgrepo diverge "bump 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/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -3010,7 +3046,7 @@ adding remote bookmark diverge adding remote bookmark feature-b added 4 changesets with 4 changes to 1 files -new changesets 72bdf4f3dc73:add0182ba53b +new changesets bc907dee0831:399353c6f5af progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) /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. @@ -3022,15 +3058,15 @@ adding remote bookmark diverge adding remote bookmark feature-b added 4 changesets with 4 changes to 1 files -new changesets 72bdf4f3dc73:add0182ba53b +new changesets bc907dee0831:f8932777a8b0 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) created new head -[diverge 2f21dc0] diverge +[diverge 0d3f8f7] diverge Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) created new head -[diverge 2f21dc0] diverge +[diverge 0d3f8f7] 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. @@ -3043,7 +3079,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 7a11b80b4cc9 +new changesets 0318944f394d 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' @@ -3060,7 +3096,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets e86906edfde1 +new changesets 0318944f394d 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' @@ -3086,10 +3122,6 @@ 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 ok 17 - remote update bookmark diverge expecting success: @@ -3107,6 +3139,10 @@ 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 adding changesets adding manifests adding file changes @@ -3114,15 +3150,15 @@ adding remote bookmark diverge adding remote bookmark feature-b added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets 72bdf4f3dc73:7a11b80b4cc9 +new changesets bc907dee0831:0318944f394d 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 8401fd5] 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] +[feature-c 7171f05] feature-c + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes @@ -3130,10 +3166,13 @@ adding remote bookmark diverge adding remote bookmark feature-b added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets 72bdf4f3dc73:e86906edfde1 +new changesets bc907dee0831:0318944f394d 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 7171f05] 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/bin/git-remote-hg: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 @@ -3144,16 +3183,19 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) -[feature-c 8401fd5] 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] 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 -/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 1 changesets with 1 changes to 1 files (+1 heads) ok 18 - remote new bookmark multiple branch head checking known breakage: @@ -3193,12 +3235,6 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) ok 18 - remote new bookmark multiple branch head expecting success: @@ -3240,56 +3276,59 @@ Cloning into 'gitrepo'... 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] /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 49cdd6b8ac1d -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-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -[master 1ff3854] copy - Author: A U Thor - 1 file changed, 2 insertions(+) - create mode 100644 content-copy -[master 795c127] moved - Author: A U Thor - 1 file changed, 0 insertions(+), 0 deletions(-) - rename content-copy => content-moved (100%) +added 2 changesets with 3 changes to 3 files +new changesets 08501c404636:95418c3a8f45 adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets e2a253f329ca:34a4bfdfd50d progress revision walk 'bookmarks/master' (1/1) +added 1 changesets with 1 changes to 1 files progress revision 0 'master' (0/2) +new changesets ec1b26ec1c6d +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] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 1827c56fed0f +new changesets ec1b26ec1c6d progress revision walk 'bookmarks/master' (0/0) +[master 7ac5245] copy + Author: A U Thor + 1 file changed, 2 insertions(+) + create mode 100644 content-copy 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 -[master 6adfab1] copy +[master f87e482] moved + Author: A U Thor + 1 file changed, 0 insertions(+), 0 deletions(-) + rename content-copy => content-moved (100%) +[master 7ac5245] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master 700ece9] moved +[master f87e482] 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/bin/git-remote-hg: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 './sub_hg_a'... no changes found searching for changes adding changesets @@ -3297,13 +3336,9 @@ 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 - ddd0160..795c127 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] -Cloning into './sub_hg_a'... + 812a661..f87e482 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] -1 files updated, 0 files merged, 0 files removed, 0 files unresolved no changes found searching for changes adding changesets @@ -3311,16 +3346,19 @@ 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..700ece9 master -> master + fffffff..f87e482 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 2 changesets with 3 changes to 3 files -new changesets c5725705350f:d49cacd38e06 +new changesets 8c24ec579d6e:43e3e98b6881 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Cloning into './sub_hg_a/sub_hg_a_x'... not ok 19 - push commits with copy and rename # TODO known breakage expecting success: @@ -3353,8 +3391,8 @@ echo "ø~?" > expected && test_cmp expected actual -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -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. + or locale.getdefaultlocale()[1] ok 19 - push commits with copy and rename expecting success: @@ -3387,41 +3425,56 @@ 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] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 4f712f069df3 +new changesets 631d1afc4576 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -warning: filename contains '?', which is reserved on Windows: 'ø~?' 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] +warning: filename contains '?', which is reserved on Windows: 'ø~?' adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 40e85134fdc5:a3197729ae38 +new changesets cd398ae24338:6b2ead31f2aa 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: 'ø~?' 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 +Cloning into 'gitrepo'... +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 7e4cebddebdf WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo + 7ee74b4..886b490 master -> origin/master + 7ee74b4..886b490 branches/default -> origin/branches/default adding changesets adding manifests adding file changes added 3 changesets with 4 changes to 2 files -new changesets 2b2c75048b0d:b450b6e1edb1 -warning: filename contains '?', which is reserved on Windows: 'ø~?' +new changesets b6badd3c3b1f:655a7f02b236 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) +Updating 7ee74b4..886b490 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ok 20 - fetch special filenames expecting success: @@ -3460,33 +3513,15 @@ 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] -searching for changes -adding changesets -adding manifests -adding file changes -Cloning into 'gitrepo'... -added 1 changesets with 1 changes to 1 files -new changesets 1dae32c623ef -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - 7d950cb..6048b59 master -> origin/master - 7d950cb..6048b59 branches/default -> origin/branches/default -Updating 7d950cb..6048b59 -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes added 3 changesets with 4 changes to 2 files -new changesets b68b9ce3c508:193b79593644 +new changesets b6badd3c3b1f:655a7f02b236 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-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... ok 20 - fetch special filenames expecting success: @@ -3525,68 +3560,87 @@ printf "content\næ rø\n" > expected && test_cmp expected actual -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 3ccb0809b116 /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) searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 991bca9796d5 -[master 57146e9] utf-8 - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 "\303\246 r\303\270" +new changesets 2b4c5f763245 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 - 5e1b8e2..9317277 branches/default -> origin/branches/default - 5e1b8e2..9317277 master -> origin/master -HEAD is now at 5e1b8e2 substate_hg_a + b5b7300..93ecbbb branches/default -> origin/branches/default + b5b7300..93ecbbb master -> origin/master Cloning into 'gitrepo'... +HEAD is now at b5b7300 substate_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] +Cloning into 'gitrepo'... WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 36ac42ed7cd1 -progress revision 1 'default' (0/1) -no changes found -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 6414a27..2274a74 branches/default -> origin/branches/default - 6414a27..2274a74 master -> origin/master -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 - 6755ab4..57146e9 master -> master -HEAD is now at 6414a27 zero_sub_hg_a_x +new changesets 0c942dd87bcb +added 1 changesets with 1 changes to 1 files +new changesets 441470a7f5ed +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 + d167742..92cca0c branches/default -> origin/branches/default + d167742..92cca0c master -> origin/master +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master b884b3a] utf-8 + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 "\303\246 r\303\270" +HEAD is now at d167742 zero_sub_hg_a_x adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets f389b06f1621 +new changesets 441470a7f5ed progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 0e9b6e4] utf-8 +[master b884b3a] utf-8 Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 "\303\246 r\303\270" +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/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.main/tmp/hgrepo + 210cae9..b884b3a master -> master +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-push/tmp/hgrepo + fffffff..b884b3a master -> master 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +ok 9 - subcommand sub subsequent recursive update + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update --rebase + ok 21 - push special filenames expecting success: @@ -3645,24 +3699,6 @@ check gitrepo origin/master one 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] -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-push/tmp/hgrepo - fffffff..0e9b6e4 master -> master -ok 9 - subcommand sub subsequent recursive update - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --rebase - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 21 - push special filenames @@ -3723,6 +3759,12 @@ fi 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 +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 @@ -3734,18 +3776,29 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 311a64a557c3:fc23a1c6d056 +new changesets c9341b4fb1cc:950f30833cf0 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 1cea911 zero -HEAD is now at 1cea911 zero -HEAD is now at 5b9dd34 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 +/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] +HEAD is now at 4fcf5a2 zero +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 54e8aaeefd8a:f632d85c80cd +HEAD is now at 4fcf5a2 zero +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at c335ca6 good branch +HEAD is now at 33a1e17 zero +HEAD is now at 33a1e17 zero +HEAD is now at efb3466 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 @@ -3766,23 +3819,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] -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 79ff66a7c8a4:f34984297c53 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at 96de5b4 zero -HEAD is now at 96de5b4 zero -HEAD is now at cce4d78 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 searching for changes adding changesets @@ -3810,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..ecef5b2 branches/good_branch -> branches/good_branch - fffffff..5eb4ed9 good_bmark -> good_bmark - fffffff..72b3813 master -> master + fffffff..ceb1593 branches/good_branch -> branches/good_branch + fffffff..09b016c good_bmark -> good_bmark + fffffff..c78f8e4 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) @@ -3823,9 +3859,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..72b3813 master -> master - fffffff..5eb4ed9 good_bmark -> good_bmark - fffffff..ecef5b2 branches/good_branch -> branches/good_branch + fffffff..c78f8e4 master -> master + fffffff..09b016c good_bmark -> good_bmark + fffffff..ceb1593 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) @@ -3837,9 +3873,34 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets a5f12a188510:ab25f0be95f3 +new changesets 78e153be4098:844b4e227d33 +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_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 02ac7b835590:9a9dcd71c76d 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. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets c1aa47bef8d5 +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] ok 22 - remote big push expecting success: @@ -3924,31 +3985,14 @@ fi ) -/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 d31e74687f08:a651dfb78cce -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. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 13ef11d360c7 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... +new changesets 2f6cb78fa1f7:640bf368ef1e ok 22 - remote big push +progress revision walk 'bookmarks/master' (1/1) expecting success: test_when_finished "rm -rf hgrepo gitrepo*" && @@ -4031,50 +4075,69 @@ fi ) +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.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 3 changes to 3 files -new changesets 66c9caf4dfec:b1d35a7c8040 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. +added 1 changesets with 1 changes to 1 files +new changesets 64dcff79bf97 +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo + 083b0ea..b966b31 master -> origin/master + 083b0ea..b966b31 branches/default -> origin/branches/default +Updating 083b0ea..b966b31 +Fast-forward + .hgsubstate | 2 +- + 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-remote-hg: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 d8c8a0b6798b +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 + d4452fa..f97fe31 branches/default -> origin/branches/default + d4452fa..f97fe31 master -> origin/master +Cloning into 'gitrepo'... Cloning into 'gitrepo'... +HEAD is now at d4452fa substate_hg_a +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 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 adding remote bookmark bad_bmark adding remote bookmark good_bmark added 3 changesets with 3 changes to 1 files -new changesets 2570e02451cb:9e7919c270c2 +new changesets cb4d8794c7da:b0cb43ba0729 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-remote-hg: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 dc47257a4007 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - 1fcf525..078eb50 master -> origin/master - 1fcf525..078eb50 branches/default -> origin/branches/default -Updating 1fcf525..078eb50 -Fast-forward - .hgsubstate | 2 +- - 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] +adding remote bookmark bad_bmark +adding remote bookmark good_bmark +added 3 changesets with 3 changes to 1 files +new changesets cb4d8794c7da:b0cb43ba0729 +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-remote-hg: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 @@ -4082,14 +4145,23 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 68c0466be077 -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 - 5437815..552c051 branches/default -> origin/branches/default - 5437815..552c051 master -> origin/master -HEAD is now at 5437815 substate_hg_a +new changesets ebabedd9bcf1 +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 + 8adf4b6..5257450 branches/default -> origin/branches/default + 8adf4b6..5257450 master -> origin/master +HEAD is now at 8adf4b6 zero_sub_hg_a_x 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] +no changes found +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 @@ -4100,7 +4172,7 @@ adding file changes updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets 6cdcdf3c4d43 +new changesets 93567d39e413 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) @@ -4113,42 +4185,57 @@ ! [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.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] +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 9d8cf38b45e0:940d77a89192 -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +updating bookmark bad_bmark +added 1 changesets with 1 changes to 1 files +new changesets 93567d39e413 searching for changes adding changesets adding manifests adding file changes -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 3c509c741663 -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 - b0ec9ed..f1cf94d branches/default -> origin/branches/default - b0ec9ed..f1cf94d master -> origin/master +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..776c9c8 good_bmark -> good_bmark + fffffff..84d7de8 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..84d7de8 master -> master + fffffff..776c9c8 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/bin/git-remote-hg: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 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 - 74ae72f..86df566 branches/bad_branch -> origin/branches/bad_branch - 1f5ea53..86df566 bad_bmark -> origin/bad_bmark -HEAD is now at b0ec9ed zero_sub_hg_a_x -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. + c8ec1c6..919277b branches/bad_branch -> origin/branches/bad_branch + baf37da..919277b 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 +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 + c8ec1c6..919277b branches/bad_branch -> origin/branches/bad_branch + baf37da..84d7de8 branches/default -> origin/branches/default + baf37da..919277b bad_bmark -> origin/bad_bmark /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 @@ -4209,57 +4296,6 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six -ok 10 - subcommand sub subsequent recursive update -- rebase - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --merge - -/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 aef0b0eb6d12 -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..05be075 good_bmark -> good_bmark - fffffff..c2d5ce1 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..c2d5ce1 master -> master - fffffff..05be075 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] -no changes found -updating bookmark good_bmark -2 local changesets published -WARNING: Branch 'default' has more than one head, consider merging -progress revision 3 'bad_branch' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - d1f300c..f66a053 branches/bad_branch -> origin/branches/bad_branch - 6fa2fda..c2d5ce1 branches/default -> origin/branches/default - 6fa2fda..f66a053 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 @@ -4318,11 +4354,17 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six +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'... /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 @@ -4330,47 +4372,14 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 42d302c6e113:8c1a0e4fad5e +new changesets e31c43916724:866646fbc54c progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 0e0658f zero -HEAD is now at 0e0658f zero -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 -HEAD is now at 5538039 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 -no changes found -searching for changes -adding changesets -adding manifests -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 - + 1680d1b...03e5070 branches/bad_branch -> branches/bad_branch (forced update) - 5538039..51bf543 branches/good_branch -> branches/good_branch - + 8537710...05adae1 bad_bmark1 -> bad_bmark1 (forced update) - + 8537710...8997430 bad_bmark2 -> bad_bmark2 (forced update) - 8537710..e62cf2c good_bmark -> good_bmark - 8537710..a3fcb86 master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - 8537710..a3fcb86 master -> master - 8537710..e62cf2c good_bmark -> good_bmark - 5538039..51bf543 branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + 8537710...05adae1 bad_bmark1 -> bad_bmark1 (forced update) - + 8537710...8997430 bad_bmark2 -> bad_bmark2 (forced update) - + 1680d1b...03e5070 branches/bad_branch -> branches/bad_branch (forced update) -Cloning into 'gitrepo'... Cloning into 'gitrepo'... +HEAD is now at bea7f59 zero +HEAD is now at bea7f59 zero +HEAD is now at ab1507b 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 @@ -4380,7 +4389,7 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets c85b903ed3b7:cc042ce60a49 +new changesets e31c43916724:866646fbc54c progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) @@ -4390,17 +4399,42 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 8d1cb62be6d9:e821c6348720 +new changesets e9947cb2df08:e8bea6c55a49 +HEAD is now at bea7f59 zero progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -HEAD is now at fe281e7 zero -HEAD is now at fe281e7 zero -HEAD is now at 07ddc0b good branch +HEAD is now at bea7f59 zero +HEAD is now at ab1507b 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 +no changes found +searching for changes +adding changesets +adding manifests +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 + + edee97b...3dcabdc branches/bad_branch -> branches/bad_branch (forced update) + ab1507b..730f389 branches/good_branch -> branches/good_branch + + c4a0d87...1b87522 bad_bmark1 -> bad_bmark1 (forced update) + + c4a0d87...260bf9b bad_bmark2 -> bad_bmark2 (forced update) + c4a0d87..f24da05 good_bmark -> good_bmark + c4a0d87..a36721b master -> master + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + c4a0d87..a36721b master -> master + c4a0d87..f24da05 good_bmark -> good_bmark + ab1507b..730f389 branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + c4a0d87...1b87522 bad_bmark1 -> bad_bmark1 (forced update) + + c4a0d87...260bf9b bad_bmark2 -> bad_bmark2 (forced update) + + edee97b...3dcabdc 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] 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] /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 @@ -4445,30 +4479,53 @@ 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...5b8365f branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...f1778e1 branches/good_branch -> branches/good_branch (forced update) - + fffffff...32c6461 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...dec916f bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...37218b7 good_bmark -> good_bmark (forced update) - + fffffff...6c13b6a master -> master (forced update) + + fffffff...3dcabdc branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...730f389 branches/good_branch -> branches/good_branch (forced update) + + fffffff...1b87522 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...260bf9b bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...f24da05 good_bmark -> good_bmark (forced update) + + fffffff...a36721b master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...6c13b6a master -> master (forced update) - + fffffff...37218b7 good_bmark -> good_bmark (forced update) - + fffffff...f1778e1 branches/good_branch -> branches/good_branch (forced update) + + fffffff...a36721b master -> master (forced update) + + fffffff...f24da05 good_bmark -> good_bmark (forced update) + + fffffff...730f389 branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...32c6461 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...dec916f bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...5b8365f branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...1b87522 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...260bf9b bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...3dcabdc 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 2 changesets with 3 changes to 3 files -new changesets 156e19032849:3ee4e85a4193 +new changesets 5779139dea94:89db72d2e5cf 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. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets b58a77da07bf +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 2d7a6b69aa6d:637f7603bc3d +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_b/sub_git'... +done. ok 24 - remote big push force expecting success: @@ -4520,27 +4577,6 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -/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 6d0d32eed1c1 -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 06099c1a0f15:c6229568f07e -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. ok 24 - remote big push force expecting success: @@ -4599,18 +4635,17 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 8815a8c0bacb +new changesets e89f3745320f progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - 161e91b..1351994 master -> origin/master - 161e91b..1351994 branches/default -> origin/branches/default -Updating 161e91b..1351994 + 0914a86..5017ba6 master -> origin/master + 0914a86..5017ba6 branches/default -> origin/branches/default +Updating 0914a86..5017ba6 Fast-forward .hgsubstate | 2 +- 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] -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 @@ -4618,16 +4653,44 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 4721c6dbc867 +new changesets c59f16fc685c 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 - adbb85f..3cdc074 branches/default -> origin/branches/default - adbb85f..3cdc074 master -> origin/master -HEAD is now at adbb85f substate_hg_a -Updating adbb85f..3cdc074 + 3e98a59..3b4eefe branches/default -> origin/branches/default + 3e98a59..3b4eefe master -> origin/master +HEAD is now at 3e98a59 substate_hg_a +Updating 3e98a59..3b4eefe Fast-forward .hgsubstate | 2 +- 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] +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 15833b5bd6bd +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 + de18bc9..ea2bd6c branches/default -> origin/branches/default + de18bc9..ea2bd6c master -> origin/master +HEAD is now at de18bc9 zero_sub_hg_a_x +Updating de18bc9..ea2bd6c +Fast-forward + content_sub_hg_a_x | 2 +- + 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] +no changes found +Cloning into 'gitrepo'... +ok 11 - subcommand sub subsequent recursive update -- merge + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_foreach + /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 @@ -4639,30 +4702,30 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 30927c528052:f57d8bab14e8 +new changesets c83b59cbeea5:12b926e5496e progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 78a2889 zero -HEAD is now at 78a2889 zero -/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. +HEAD is now at 121d86f zero +HEAD is now at 121d86f zero +Cloning into 'gitrepo'... +HEAD is now at 96fce92 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] -HEAD is now at 912aaac good branch -searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets b71b7c5dd3c2 -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 - 8f7fd40..3b17b75 branches/default -> origin/branches/default - 8f7fd40..3b17b75 master -> origin/master -HEAD is now at 8f7fd40 zero_sub_hg_a_x -Updating 8f7fd40..3b17b75 -Fast-forward - content_sub_hg_a_x | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +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 c83b59cbeea5:a3b8bda5343f +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 121d86f zero +HEAD is now at 121d86f zero +HEAD is now at 2a70a4e 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 @@ -4680,56 +4743,29 @@ ! [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-remote-hg: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 11 - subcommand sub subsequent recursive update -- merge - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_foreach - /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 - 912aaac..0cc49a4 branches/good_branch -> branches/good_branch - cd45898..c93f3fd good_bmark -> good_bmark - cd45898..598823e master -> master + 96fce92..7ef31ab branches/good_branch -> branches/good_branch + a3e967d..005d810 good_bmark -> good_bmark + a3e967d..d992262 master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - cd45898..598823e master -> master - cd45898..c93f3fd good_bmark -> good_bmark - 912aaac..0cc49a4 branches/good_branch -> branches/good_branch + a3e967d..d992262 master -> master + a3e967d..005d810 good_bmark -> good_bmark + 96fce92..7ef31ab branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_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] -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 df4abd6f504f:03d9df0380aa -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at 5129b5a zero -HEAD is now at 5129b5a zero -HEAD is now at ff57648 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..53fa89d branches/good_branch -> branches/good_branch - fffffff..dfeeae9 good_bmark -> good_bmark - fffffff..4c72a53 master -> master + fffffff..1f48d86 branches/good_branch -> branches/good_branch + fffffff..d53fae4 good_bmark -> good_bmark + fffffff..00bf05f 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..4c72a53 master -> master - fffffff..dfeeae9 good_bmark -> good_bmark - fffffff..53fa89d branches/good_branch -> branches/good_branch + fffffff..00bf05f master -> master + fffffff..d53fae4 good_bmark -> good_bmark + fffffff..1f48d86 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,14 +4788,14 @@ 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..53fa89d branches/good_branch -> branches/good_branch - fffffff..dfeeae9 good_bmark -> good_bmark - fffffff..4c72a53 master -> master + fffffff..1f48d86 branches/good_branch -> branches/good_branch + fffffff..d53fae4 good_bmark -> good_bmark + fffffff..00bf05f master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - fffffff..4c72a53 master -> master - fffffff..dfeeae9 good_bmark -> good_bmark - fffffff..53fa89d branches/good_branch -> branches/good_branch + fffffff..00bf05f master -> master + fffffff..d53fae4 good_bmark -> good_bmark + fffffff..1f48d86 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ok 25 - remote big push dry-run @@ -4866,40 +4902,21 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 1fdb586e7a96:53ae4acbc73a +new changesets d73aa2e76a45:b6241a4a6d14 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_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 -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 38576401f50c:74544f8ce7e7 -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.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 3adf7fc4b604:087fca04e70a +new changesets 7b14c9711923:9ed4cb7d26dd progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -HEAD is now at c94688a zero -HEAD is now at c94688a zero -HEAD is now at fbfb431 good branch 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. or locale.getdefaultlocale()[1] @@ -4907,46 +4924,41 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 7f6cb6fa89b9 +new changesets a6c6a0f02b62 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... +Cloning into './sub_hg_b'... /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 - + 9fca091...5011d10 branches/bad_branch -> branches/bad_branch (forced update) - fbfb431..1711db8 branches/good_branch -> branches/good_branch - + 8929b19...fadceda bad_bmark1 -> bad_bmark1 (forced update) - + 8929b19...c7ba792 bad_bmark2 -> bad_bmark2 (forced update) - 8929b19..7d02778 good_bmark -> good_bmark - 8929b19..c27324f master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - 8929b19..c27324f master -> master - 8929b19..7d02778 good_bmark -> good_bmark - fbfb431..1711db8 branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + 8929b19...fadceda bad_bmark1 -> bad_bmark1 (forced update) - + 8929b19...c7ba792 bad_bmark2 -> bad_bmark2 (forced update) - + 9fca091...5011d10 branches/bad_branch -> branches/bad_branch (forced update) -Cloning into './sub_hg_b'... +adding changesets +adding manifests +adding file changes +adding remote bookmark bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +added 4 changesets with 4 changes to 1 files +new changesets bb8ca3cb5b35:70631615d8de /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) +progress revision 2 'bad_branch' (0/2) adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 735cbbe13e23:ecfd9872f463 +new changesets 735dad8f5f8d:cef2f6768f79 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +HEAD is now at 05d0ddc zero +HEAD is now at 05d0ddc zero +HEAD is now at 7b51895 good branch +Cloning into 'gitrepo'... Cloning into './sub_hg_b/sub_git'... done. -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 @@ -4956,14 +4968,41 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets eaa3c444e4f4:141f9de79081 -hg 473bec8da6989ad762ebe6916de4f4cb3a756815 087fca04e70abb38892b83288c122ad24621fd5d sub_hg_a /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo -hg 5b65f44adf7b2b7f28d3826dc9fac1fb2b992452 7f6cb6fa89b90185710d15bac29fd79bb65e4a55 sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo/sub_hg_a -hg fde287acc92c6eca28339ea1a6cc9a6807132383 ecfd9872f4634d1b768863805738c91a859658a3 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 +new changesets de6a98637585:df108c5c3eb2 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.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 +no changes found +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + + 55725af...e4d20e5 branches/bad_branch -> branches/bad_branch (forced update) + 7b51895..fc7c371 branches/good_branch -> branches/good_branch + + cdcf06d...0d773b9 bad_bmark1 -> bad_bmark1 (forced update) + + cdcf06d...0e652ee bad_bmark2 -> bad_bmark2 (forced update) + cdcf06d..70532fc good_bmark -> good_bmark + cdcf06d..faec46c master -> master + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + cdcf06d..faec46c master -> master + cdcf06d..70532fc good_bmark -> good_bmark +HEAD is now at c1f8311 zero + 7b51895..fc7c371 branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + cdcf06d...0d773b9 bad_bmark1 -> bad_bmark1 (forced update) + + cdcf06d...0e652ee bad_bmark2 -> bad_bmark2 (forced update) + + 55725af...e4d20e5 branches/bad_branch -> branches/bad_branch (forced update) +HEAD is now at c1f8311 zero +HEAD is now at fe51b34 good branch +hg 7679ac0d205c861cccce88065e4cc347b02870a8 9ed4cb7d26dd919f85c6ba97212c903a44e4c697 sub_hg_a /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo +hg b0959f40c926dd3827a4a087e3e6c74353e4b63c a6c6a0f02b6268dc7940dd19e3df0c16cef0137c sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo/sub_hg_a +hg 2f968ce313fe4114ad6b5f3c4ee81c2a5abd4e53 cef2f6768f79e1942588d69f3586bd1fe2f6e1dc 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 ok 12 - subcommand sub foreach expecting success: @@ -4996,9 +5035,27 @@ test_cmp expected actual ) -HEAD is now at d81cc79 zero -HEAD is now at d81cc79 zero -HEAD is now at db7067b 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...259d6d6 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...ef9c6ab branches/good_branch -> branches/good_branch (forced update) + + fffffff...0572116 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...861c7ac bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...790e3f4 good_bmark -> good_bmark (forced update) + + fffffff...d766a06 master -> master (forced update) + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + + fffffff...d766a06 master -> master (forced update) + + fffffff...790e3f4 good_bmark -> good_bmark (forced update) + + fffffff...ef9c6ab branches/good_branch -> branches/good_branch (forced update) + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + fffffff...0572116 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...861c7ac bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...259d6d6 branches/bad_branch -> branches/bad_branch (forced update) +Cloning into 'gitrepo'... ok 26 - remote big push force dry-run expecting success: @@ -5024,71 +5081,18 @@ test_expect_code 1 git push ) -/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...e6650e3 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...e543bde branches/good_branch -> branches/good_branch (forced update) - + fffffff...8e27de4 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...1027329 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...e31ec57 good_bmark -> good_bmark (forced update) - + fffffff...02fba8f master -> master (forced update) - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - + fffffff...02fba8f master -> master (forced update) - + fffffff...e31ec57 good_bmark -> good_bmark (forced update) - + fffffff...e543bde branches/good_branch -> branches/good_branch (forced update) - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + fffffff...8e27de4 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...1027329 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...e6650e3 branches/bad_branch -> branches/bad_branch (forced update) -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 1 files -new changesets adcd55e8cdb0:a17884332a71 -Cloning into 'gitrepo'... -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -HEAD is now at b8ae2ab zero -[master a57c03d] 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 2 changesets with 3 changes to 3 files -new changesets ac15caef4b4e:d8f4b749c6de +new changesets 8525d20ba496:a23578ba74b4 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 -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' -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.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 ok 26 - remote big push force dry-run expecting success: @@ -5114,57 +5118,35 @@ test_expect_code 1 git push ) -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' -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. -ok 27 - remote double failed push - -expecting success: - test_when_finished "rm -rf gitrepo hgrepo" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero && - echo feature-a > content && - hg commit -m feature-a - hg bookmark feature-a - ) && - - git clone "hg::hgrepo" gitrepo && - check gitrepo origin/feature-a feature-a && - - ( - cd hgrepo && - hg bookmark -d feature-a - ) && - - ( - cd gitrepo && - git fetch --prune origin - git branch -a > out && - ! grep feature-a out - ) - /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 3682d12d3ba6 +new changesets 0f2a71fe40ed 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 url = foobar +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +new changesets 4e237afc7e93:c67ce14bd1fd +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +HEAD is now at d6b7af7 zero +[master 50527bd] 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] +Cloning into 'gitrepo'... ok 13 - subcommand sub sync expecting success: @@ -5229,35 +5211,76 @@ check_branch hgclone/sub_hg default one_sub_hg && check hgclone/sub_git HEAD one_sub_git -Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.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' +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 729680270518:83fd0db02b04 +new changesets 0a29d97527d3:0549e5ab7650 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... -HEAD is now at 8c8dec2 zero -[master acaefcf] 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 +HEAD is now at 0f3df0f zero +[master e70b75b] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +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' +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. +ok 27 - remote double failed push + +expecting success: + test_when_finished "rm -rf gitrepo hgrepo" && + + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero && + echo feature-a > content && + hg commit -m feature-a + hg bookmark feature-a + ) && + + git clone "hg::hgrepo" gitrepo && + check gitrepo origin/feature-a feature-a && + + ( + cd hgrepo && + hg bookmark -d feature-a + ) && + + ( + cd gitrepo && + git fetch --prune origin + git branch -a > out && + ! grep feature-a out + ) + /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 feature-a -added 2 changesets with 2 changes to 1 files -new changesets 729680270518:6ef1332a6b80 -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) @@ -5276,8 +5299,6 @@ 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/bin/git-remote-hg: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 27 - remote double failed push expecting success: @@ -5309,17 +5330,56 @@ ! grep feature-a out ) -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' [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] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +adding remote bookmark feature-a +added 2 changesets with 2 changes to 1 files +new changesets 6fa7f727f476:d7d208c62b4f +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] +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 03effbaff8c9:fa1f39b4aba7 +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'... +/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 +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 - [deleted] (none) -> origin/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] +adding changesets +adding manifests +adding file changes +adding remote bookmark feature-a +added 2 changesets with 2 changes to 1 files +new changesets ffe60f03d157:b40052cb347b +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 28 - fetch prune expecting success: @@ -5364,78 +5424,36 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.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 d40eec70b9a9:4492012fec9e -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -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'... -/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 -adding remote bookmark feature-a -added 2 changesets with 2 changes to 1 files -new changesets 0086a382d53d:8cc93143c7ff -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.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] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 503f90c62f84 +new changesets 89bd21fab285 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) Cloning into './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] done. -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 (+1 heads) -new changesets 0086a382d53d:3dc1fc1fb9ed -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 -[detached HEAD 0734529] one_sub_hg +[detached HEAD c4d69df] 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 error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' +no changes found From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - [deleted] (none) -> origin/feature-a -1 files updated, 0 files merged, 1 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] -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/sub_hg + fffffff..c4d69df HEAD -> master ok 28 - fetch prune expecting success: @@ -5480,80 +5498,55 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -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/sub_hg - fffffff..0734529 HEAD -> master +0 files updated, 0 files merged, 1 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] 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 - 3492ec9..0734529 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 + 2829727..c4d69df branches/default -> origin/branches/default [detached HEAD cea1af1] one_sub_git Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -searching for changes -adding changesets To /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git * [new branch] HEAD -> new -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets f0c3189b25d7 -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 - + 5a77714...51268a3 branches/default -> origin/branches/default (forced update) - + 5a77714...51268a3 master -> origin/master (forced update) +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-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 eed3e7ef654c5f69d1ef259e670b5c50339dfc42 [git 0734529] +Updating ./sub_hg to 8210e7c719c73b47d90a78daec295b7728f1827b [git c4d69df] Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] +/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 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff --git a/.hgsubstate b/.hgsubstate -index 792c1df..5554c8c 100644 +index fabd6e5..57dc68a 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -1,2 +1,2 @@ -e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git --503f90c62f841d12fc5c173b7f8a4b44d8e18505 sub_hg +-89bd21fab285e74f6b54eec9164498b132de0dd4 sub_hg +cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git -+eed3e7ef654c5f69d1ef259e670b5c50339dfc42 sub_hg ++8210e7c719c73b47d90a78daec295b7728f1827b sub_hg M .hgsubstate -[master 8d857e7] update_sub +[master 5aeba65] update_sub Author: A U Thor 1 file changed, 2 insertions(+), 2 deletions(-) -ok 29 - fetch multiple independent histories - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo a > a && - hg add a && - hg commit -m a && - hg bookmark -r null bookmark - ) && - - ( - git clone "hg::hgrepo" gitrepo && - check gitrepo HEAD a && - cd gitrepo && - git checkout --quiet -b bookmark && - git remote -v && - echo b > b && - git add b && - git commit -m b && - git push origin bookmark - ) - +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files (+1 heads) +new changesets 428484be1bbc:01ffe3683e41 +WARNING: Branch 'default' has more than one head, consider merging +WARNING: Branch 'default' has more than one head, consider merging +progress revision 1 'default' (0/1) +From hg::../hgrepo + * [new branch] branches/default -> branches/default + * [new branch] master -> master + * [new branch] branches/default -> origin/branches/default + * [new branch] master -> origin/master /build/reproducible-path/git-remote-hg-1.0.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 @@ -5563,7 +5556,8 @@ 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..8d857e7 master -> master + fffffff..5aeba65 master -> master +1 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-push/tmp/gitrepo/ Cloning into '/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgclone/sub_git'... @@ -5573,14 +5567,13 @@ 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 -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] adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets cae4f5faf59c:f0e5b54aa772 +new changesets 428484be1bbc:9c8572bfb796 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) @@ -5589,21 +5582,50 @@ * [new branch] master -> master * [new branch] branches/default -> origin/branches/default * [new branch] master -> origin/master -Cloning into 'gitrepo'... -1 files updated, 0 files merged, 1 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 +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +searching for changes adding changesets adding manifests adding file changes -adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -new changesets 945c8c945a34 -WARNING: Ignoring invalid bookmark 'bookmark' -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +new changesets f4776c776db0 +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 + + dd57532...eea9a08 branches/default -> origin/branches/default (forced update) + + dd57532...eea9a08 master -> origin/master (forced update) +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +ok 29 - fetch multiple independent histories + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo a > a && + hg add a && + hg commit -m a && + hg bookmark -r null bookmark + ) && + + ( + git clone "hg::hgrepo" gitrepo && + check gitrepo HEAD a && + cd gitrepo && + git checkout --quiet -b bookmark && + git remote -v && + echo b > b && + git add b && + git commit -m b && + git push origin bookmark + ) + ok 14 - subcommand sub addstate expecting success: @@ -5648,59 +5670,20 @@ test_cmp output actual ) -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 d058f7f] b - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 b -/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 -WARNING: Ignoring invalid bookmark 'bookmark' -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.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.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 30 - clone remote with null bookmark, then push - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && - - ( - hg init hgrepo && - cd hgrepo && - echo one > content && - hg add content && - hg commit -m one && - echo two > content && - hg commit -m two - ) && - - git clone "hg::hgrepo" gitrepo && - hg -R hgrepo log --template "{node}\n\n" > expected && - git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && - test_cmp expected actual - searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets edcd6e90bb21 +new changesets 81368c2986a7 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 - + 049bd88...ae00f2f branches/default -> origin/branches/default (forced update) - + 049bd88...ae00f2f master -> origin/master (forced update) + + 9614bc2...748ed97 branches/default -> origin/branches/default (forced update) + + 9614bc2...748ed97 master -> origin/master (forced update) ok 29 - fetch multiple independent histories expecting success: @@ -5732,33 +5715,38 @@ 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 2 changes to 1 files -new changesets 16bdabb3117c:fac0bc09e96b -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git +adding remote bookmark bookmark +added 1 changesets with 1 changes to 1 files +new changesets 3474650cfe97 +WARNING: Ignoring invalid bookmark 'bookmark' +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +origin hg::/build/reproducible-path/git-remote-hg-1.0.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 0708792] b 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. + create mode 100644 b +/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 +WARNING: Ignoring invalid bookmark 'bookmark' +searching for changes adding changesets adding manifests adding file changes -adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -new changesets 4106ea669b21 -WARNING: Ignoring invalid bookmark 'bookmark' -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -ok 31 - notes +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + * [new branch] bookmark -> bookmark +Cloning into 'gitrepo'... +ok 30 - clone remote with null bookmark, then push -checking known breakage: +expecting success: test_when_finished "rm -rf hgrepo gitrepo" && ( @@ -5766,31 +5754,40 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one - ) && - - git clone "hg::hgrepo" gitrepo && - - ( - cd gitrepo && + hg commit -m one && echo two > content && - git commit -a -m two && - git push + hg commit -m two ) && + git clone "hg::hgrepo" gitrepo && hg -R hgrepo log --template "{node}\n\n" > expected && git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual +/build/reproducible-path/git-remote-hg-1.0.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 bookmark +added 1 changesets with 1 changes to 1 files +new changesets 76433cdf2d79 +WARNING: Ignoring invalid bookmark 'bookmark' +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) origin hg::/build/reproducible-path/git-remote-hg-1.0.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 c718447] b +[bookmark 7a9abcb] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b +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-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... no changes found WARNING: Ignoring invalid bookmark 'bookmark' searching for changes @@ -5820,14 +5817,15 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.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 34a50cc72a2e:7572fa2784bd -Cloning into 'gitrepo'... +new changesets cd6e081369ea:adc819247123 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. @@ -5837,59 +5835,19 @@ adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets e4ef6516a7a4 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 2 changesets with 2 changes to 1 files +new changesets 68125aaebc4a:dd85115a761d +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] /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'... -[master 878e8fc] 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.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 1ac1a1a4b3c3 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) Cloning into 'gitrepo'... -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - 34cafb1..878e8fc 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] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 573406ef8d49:b740c9cb3b15 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) ---- expected 2025-09-25 01:34:39.191531630 +0000 -+++ actual 2025-09-25 01:34:39.283532208 +0000 -@@ -1,4 +1,3 @@ --c13c1353db0cdef3587e51fcb3993f580b72b61e - - e4ef6516a7a467340c5b431ea4b2c3dae8298fc7 - -not ok 32 - push updates notes # TODO known breakage +ok 31 - notes -expecting success: +checking known breakage: test_when_finished "rm -rf hgrepo gitrepo" && ( @@ -5906,19 +5864,31 @@ cd gitrepo && echo two > content && git commit -a -m two && - git push origin master && - git branch feature-a && - git push origin feature-a + git push ) && - check_bookmark hgrepo feature-a two + hg -R hgrepo log --template "{node}\n\n" > expected && + git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && + test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.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] -/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.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_git'... -done. +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 1079e2a009b5 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +new changesets 9a2b368ecd68:009e0df5a9a5 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 31 - notes expecting success: @@ -5945,18 +5915,16 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -[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.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] - 7fb91940f4a112dc6a40bf37b2c2e56e2096e739 ./sub_hg_a (heads/master) --989f7f699e208cfc68fae403ecc0f260ec0a23cd[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) - 7fb91940f4a112dc6a40bf37b2c2e56e2096e739 ./sub_hg_a (heads/master) --989f7f699e208cfc68fae403ecc0f260ec0a23cd[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~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(-) /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 @@ -5965,35 +5933,25 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 7b94ad43460f +new changesets 95f59859e44b 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] -[master 2906963] two +[master 5583fc4] 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] + c8cb4c79179f7b7e8b6bc8007b0835744e95517c ./sub_hg_a (heads/master) +-86f1b3534175a26f4d41e624753ca0d14a999fa0[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) + c8cb4c79179f7b7e8b6bc8007b0835744e95517c ./sub_hg_a (heads/master) Cloning into 'gitrepo'... -+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] +-86f1b3534175a26f4d41e624753ca0d14a999fa0[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~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 7b94ad43460f -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) no changes found searching for changes adding changesets @@ -6001,30 +5959,36 @@ 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 - e09f498..2906963 master -> master -[master 2906963] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) + a460753..5583fc4 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.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-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -no changes found -1 local changesets published -searching for changes adding changesets -searching for changes adding manifests -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - * [new branch] feature-a -> feature-a 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..2906963 master -> master -ok 33 - push bookmark without changesets +new changesets 95f59859e44b +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] +[master 5583fc4] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) +ok 15 - subcommand sub status + +# passed all 15 test(s) +1..15 +--- expected 2026-10-28 08:00:59.271048978 +0000 ++++ actual 2026-10-28 08:00:59.335048978 +0000 +@@ -1,4 +1,3 @@ +-533ccee71b88d9f019e9360145c14201b3e87222 + + 95f59859e44b7822845eab83e19ac2b4627508dc + +not ok 32 - push updates notes # TODO known breakage expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6039,13 +6003,27 @@ git clone "hg::hgrepo" gitrepo && - (cd hgrepo && hg tag v1.0) && - (cd gitrepo && git pull) && + ( + cd gitrepo && + echo two > content && + git commit -a -m two && + git push origin master && + git branch feature-a && + git push origin feature-a + ) && - echo "v1.0" > expected && - git --git-dir=gitrepo/.git tag > actual && - test_cmp expected actual + 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. + 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..5583fc4 master -> master ok 32 - push updates notes expecting success: @@ -6073,68 +6051,65 @@ check_bookmark hgrepo feature-a two 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 ef101b5ba3b9 /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' (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 ef101b5ba3b9 +new changesets 9cb8fd630919 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master f3b06b7] two +[master 93cac2a] 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. +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 -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..f3b06b7 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. +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + 7140877..93cac2a 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] -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 ffb077186c5a -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - 6d059de..1031ab5 master -> origin/master - 6d059de..1031ab5 branches/default -> origin/branches/default - * [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. +new changesets 9cb8fd630919 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 93cac2a] 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 1 local changesets published searching for changes -Updating 6d059de..1031ab5 -Fast-forward -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 * [new branch] feature-a -> feature-a - .hgtags | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 .hgtags -ok 34 - pull tags +/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..93cac2a master -> master +ok 33 - push bookmark without changesets expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6144,31 +6119,25 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one && - hg branch feature && - echo two > content && - hg commit -m two && - hg update default && - echo three > content && - hg commit -m three + hg commit -m one ) && - ( git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git merge -m Merge -Xtheirs origin/branches/feature && - git push - ) && - cat > expected <<-EOF && - Merge - three - two - one - EOF - hg -R hgrepo log --template "{desc}\n" > actual && + (cd hgrepo && hg tag v1.0) && + (cd gitrepo && git pull) && + + echo "v1.0" > expected && + 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-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: @@ -6191,19 +6160,18 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.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 1 changesets with 1 changes to 1 files -new changesets fa2b485ceb85 +new changesets 400d2e4a5521 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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] @@ -6211,26 +6179,25 @@ 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 28bb684a04c2 -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - f233dba..e721a40 master -> origin/master - f233dba..e721a40 branches/default -> origin/branches/default - * [new tag] v1.0 -> v1.0 +new changesets 400d2e4a5521 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +searching for changes adding changesets adding manifests adding file changes -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 14a40f4405cc:da9ce01f8a2f -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'feature' (0/1) -Updating f233dba..e721a40 +added 1 changesets with 1 changes to 1 files +new changesets c40d231f43df +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + 7088bd7..de33235 master -> origin/master + 7088bd7..de33235 branches/default -> origin/branches/default + * [new tag] v1.0 -> v1.0 +Updating 7088bd7..de33235 Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -6270,23 +6237,25 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual -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. +/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 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 - 7fd8b50..4b0a0ca master -> master -ok 35 - push merged named branch +added 1 changesets with 1 changes to 1 files +new changesets 7c01bcb0941f +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + 7088bd7..983b54a master -> origin/master + 7088bd7..983b54a branches/default -> origin/branches/default + * [new tag] v1.0 -> v1.0 +Updating 7088bd7..983b54a +Fast-forward + .hgtags | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 .hgtags +ok 34 - pull tags expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6296,24 +6265,36 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one + hg commit -m one && + hg branch feature && + echo two > content && + hg commit -m two && + hg update default && + echo three > content && + hg commit -m three ) && ( git clone "hg::hgrepo" gitrepo && cd gitrepo && - git tag v1.0 && - git push --tags + git merge -m Merge -Xtheirs origin/branches/feature && + git push ) && - echo "C O Mitter " > expected && - hg -R hgrepo log --template "{author}\n" -r tip > actual && + cat > expected <<-EOF && + Merge + three + two + one + EOF + hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual marked working directory as branch feature (branches are permanent and global, did you want a bookmark?) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Cloning into 'gitrepo'... +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.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] @@ -6322,24 +6303,17 @@ adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 62c978bab8fa -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] -adding changesets -adding manifests -adding file changes added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 37c1667f21df:5d4e18478c4f +new changesets 30ecea5b54b0:53a559ad3796 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved Auto-merging content Merge made by the 'ort' strategy. content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +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 @@ -6349,20 +6323,20 @@ adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files +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 - * [new tag] v1.0 -> v1.0 + 85f6016..d529d71 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] -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-push/tmp/hgrepo - fffffff..917b37f master -> master -ok 36 - light tag sets author +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets 30ecea5b54b0:b255e001bc64 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'feature' (0/1) +ok 35 - push merged named branch expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6372,27 +6346,37 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one && - hg branch feature && - echo two > content && - hg commit -m two + hg commit -m one ) && ( git clone "hg::hgrepo" gitrepo && cd gitrepo && - git branch && - git checkout branches/feature && git tag v1.0 && git push --tags ) && - echo feature > expected && - hg -R hgrepo log --template="{branch}\n" -r tip > actual && + echo "C O Mitter " > expected && + hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual +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-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (-1 heads) +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..09a4120 master -> master ok 35 - push merged named branch +Cloning into 'gitrepo'... expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6415,49 +6399,39 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual -Cloning into 'gitrepo'... -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) -/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 1 changesets with 1 changes to 1 files -new changesets cf257c92f4da +new changesets df89c3ba1096 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] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... +no changes found +searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 1 files -new changesets cf257c92f4da:34f849f7bd14 +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] -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'feature' (0/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 - * [new tag] v1.0 -> v1.0 -* 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 -no changes found +new changesets df89c3ba1096 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 36 - light tag sets author expecting success: @@ -6487,14 +6461,17 @@ 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-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/tmp/hgrepo +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 -ok 37 - push tag different branch +ok 36 - light tag sets author expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6502,57 +6479,71 @@ ( hg init hgrepo && cd hgrepo && - - echo test > test_file && - hg add test_file && - hg commit -m add && - - hg rm test_file && - hg commit -m remove + echo one > content && + hg add content && + hg commit -m one && + hg branch feature && + echo two > content && + hg commit -m two ) && + ( git clone "hg::hgrepo" gitrepo && - check_files gitrepo + cd gitrepo && + git branch && + git checkout branches/feature && + git tag v1.0 && + git push --tags + ) && + + echo feature > expected && + hg -R hgrepo log --template="{branch}\n" -r tip > actual && + test_cmp expected actual marked working directory as branch feature (branches are permanent and global, did you want a bookmark?) Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.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 2 changesets with 2 changes to 1 files -new changesets 6da119df5c67:d03eba546676 +new changesets 9255c4f5d146:a39ecbf4abf8 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'... -/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 -adding changesets -adding manifests -adding file changes -added 2 changesets with 1 changes to 1 files -new changesets b58e4ecf97e3:b75141e19317 +Cloning into 'gitrepo'... searching for changes -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 -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 * [new tag] v1.0 -> v1.0 -ok 38 - cloning a removed file works +/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 9255c4f5d146:ee9a30b22929 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'feature' (0/1) +ok 37 - push tag different branch expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6561,20 +6552,30 @@ hg init hgrepo && cd hgrepo && - echo test > dir_or_file && - hg add dir_or_file && + echo test > test_file && + hg add test_file && hg commit -m add && - hg rm dir_or_file && - mkdir dir_or_file && - echo test > dir_or_file/test_file && - hg add dir_or_file/test_file && - hg commit -m replase + hg rm test_file && + hg commit -m remove ) && git clone "hg::hgrepo" gitrepo && - check_files gitrepo "dir_or_file/test_file" + check_files 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-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 + * [new tag] v1.0 -> v1.0 ok 37 - push tag different branch expecting success: @@ -6596,25 +6597,48 @@ check_files gitrepo 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] -adding changesets 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 75e0f53050bd:3a1aebefed07 +new changesets 006da2696f46:14c38f007275 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +ok 38 - cloning a removed file works + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + hg init hgrepo && + cd hgrepo && + + echo test > dir_or_file && + hg add dir_or_file && + hg commit -m add && + + hg rm dir_or_file && + mkdir dir_or_file && + echo test > dir_or_file/test_file && + hg add dir_or_file/test_file && + hg commit -m replase + ) && + + 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-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 d6d81e73dba1:aebdbe3920b6 +added 2 changesets with 1 changes to 1 files +new changesets 68435e6a3df7:685630420b65 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 38 - cloning a removed file works @@ -6640,6 +6664,18 @@ 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. + 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 a7b3c2bf8888:f43b7ad6c511 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 39 - cloning a file replaced with a directory expecting success: @@ -6668,12 +6704,11 @@ 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'... adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 21818afa5e19:3d272f11d828 +new changesets d373429cd9fc:c787ef7991b9 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 39 - cloning a file replaced with a directory @@ -6701,6 +6736,7 @@ 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 @@ -6709,7 +6745,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 5354fd62af4f:ce452606cde7 +new changesets 915445bd7f15:b8695bf9687e progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 40 - clone replace directory with a file @@ -6735,20 +6771,16 @@ git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && check_files gitrepo "test.txt" -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 2 changesets with 2 changes to 2 files -new changesets c5823547b658:980322186412 +new changesets 0c4d830a1204:a580255ba2f4 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... ok 40 - clone replace directory with a file expecting success: @@ -6772,6 +6804,12 @@ git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && check_files gitrepo "test.txt" +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?) /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 @@ -6780,7 +6818,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -new changesets 9453bbf0f422:6da80421f71b +new changesets f770ccfe5714:f43ddb3435b8 WARNING: Ignoring matched branch parent/child progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) @@ -6814,67 +6852,20 @@ test_cmp expected actual -marked working directory as branch parent -(branches are permanent and global, did you want a bookmark?) -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 66e4bfa60286 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) marked working directory as branch parent/child -/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'... -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 +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 -new changesets 58750c7716aa:5984cc29c3f1 +new changesets 33840e2c569f:d183b56588b2 WARNING: Ignoring matched branch parent/child progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'parent' (0/1) -ok 42 - push annotated tag - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo1 gitrepo2" && - - hg init hgrepo && - - ( - git clone "hg::hgrepo" gitrepo1 && - cd gitrepo1 && - echo two >> content && - git add content && - git commit -m two --date="2016-09-26 00:00:00 -0230" && - git push - ) && - - git clone "hg::hgrepo" gitrepo2 && - - git --git-dir=gitrepo1/.git log -1 --format="%ai" > expected && - git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && - test_cmp expected actual - ok 41 - clone can ignore invalid refnames expecting success: @@ -6904,19 +6895,17 @@ test_cmp expected actual -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 -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 -Cloning into 'gitrepo'... +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 6add4c355f97 +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 @@ -6928,35 +6917,42 @@ 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 branch] master -> master + * [new tag] v1.0 -> v1.0 +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 'gitrepo2'... -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets f451e8e26a20 -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 +ok 42 - push annotated tag + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo1 gitrepo2" && + + hg init hgrepo && + + ( + git clone "hg::hgrepo" gitrepo1 && + cd gitrepo1 && + echo two >> content && + git add content && + git commit -m two --date="2016-09-26 00:00:00 -0230" && + git push + ) && + + git clone "hg::hgrepo" gitrepo2 && + + git --git-dir=gitrepo1/.git log -1 --format="%ai" > expected && + git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && + test_cmp expected actual + adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets e522f351d13b +new changesets fe46bd9e9793 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-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 43 - timezone issues with negative offsets - -# still have 2 known breakage(s) -# passed all remaining 41 test(s) -1..43 no changes found searching for changes adding changesets @@ -6965,6 +6961,17 @@ 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 +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: @@ -6987,16 +6994,45 @@ git --git-dir=gitrepo2/.git log -1 --format="%ai" > 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 branch] master -> master Cloning into 'gitrepo1'... +Cloning into 'gitrepo2'... /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] no changes found +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways warning: You appear to have cloned an empty repository. +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets e522f351d13b +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) [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 + +# still have 2 known breakage(s) +# passed all remaining 41 test(s) +1..43 /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 @@ -7049,7 +7085,7 @@ adding file changes adding remote bookmark feature-a added 1 changesets with 1 changes to 1 files -new changesets 38da54b20012 +new changesets b488ae647d70 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 4a6980563fa1 +new changesets dc0197e4f6d0 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 1e1102e] one +[master 041cda0] 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 c7c99aa4b034 +new changesets 09e30c297ad5 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 f8226a7bdab2:9ff99ca749fd +new changesets c7eb94a4996e:147aed066303 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 - f01132e..29ae111 master -> origin/master - f01132e..29ae111 branches/default -> origin/branches/default -HEAD is now at 29ae111 restored + d20bdf6..fef397f master -> origin/master + d20bdf6..fef397f branches/default -> origin/branches/default +HEAD is now at fef397f 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 a66c3b1687ed04c67ca01eddc47748c31728282f) + ! [remote rejected] master -> master (rejected not pushing hg based commit f26555dc6aa23d8edc8e99b17a60ef6f846fdc57) 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 a66c3b1687ed04c67ca01eddc47748c31728282f) + ! [remote rejected] master -> master (rejected not pushing hg based commit f26555dc6aa23d8edc8e99b17a60ef6f846fdc57) 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 - 55d6944..f3408dd master -> origin/master - 55d6944..f3408dd branches/default -> origin/branches/default -HEAD is now at f3408dd restored + 350395f..0a08bbd master -> origin/master + 350395f..0a08bbd branches/default -> origin/branches/default +HEAD is now at 0a08bbd 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 d7435ea44307c80706a17e91fe308bfd095f0b8d for 09fa88b817df84731fd28d71749275e60668ab35 -WARNING: Pushing hg changeset 099d7e64e8a47ff67a90bbcb42e53c69c6820ac9 for a876e17f97667c41352b96448e9b682b82e93747 -WARNING: Pushing hg changeset 506855c73b7c4665aede50d731ba850c425a096d for ab8333b4fa6835186f1882f95ebeab509eb974eb -WARNING: Pushing hg changeset c93db0cacb17c8d8b827434fa4e3682b3b9a4f83 for 81140b4c4d148b226b57f499a417db3c49b0ce6a -WARNING: Pushing hg changeset fdf18ed31033fe7268c0271d1df77d4355a9f08c for f3408dd3fe863bae3ab3214b708cd6fc2742e40b +WARNING: Pushing hg changeset 83e4f0d480572b29216959fab0f79fa569b8d43d for 86aef2af28fea46f76301bae3be057b1529cdf2a +WARNING: Pushing hg changeset b038f995534f35df76a739b09fe0b4686e462fca for 091dc45f43b4a79d011967b11726305eafb81f4b +WARNING: Pushing hg changeset 7e77d47976700a1bf10068e28976cbeb111b273a for 05e62cb895dc46602e77677c9e997c926cc8d026 +WARNING: Pushing hg changeset 4097fc4d9cdd3392453e08c8d665c35b7f5af537 for 910baecd56968501c9d0759bdf2f9dbb64d1d9e8 +WARNING: Pushing hg changeset c778e8b47291ff86133752df71de001048f185b8 for 0a08bbdcfba0e40e78584137e327b152597f3376 To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..f3408dd master -> master -WARNING: Pushing hg changeset d7435ea44307c80706a17e91fe308bfd095f0b8d for 09fa88b817df84731fd28d71749275e60668ab35 -WARNING: Pushing hg changeset 099d7e64e8a47ff67a90bbcb42e53c69c6820ac9 for a876e17f97667c41352b96448e9b682b82e93747 -WARNING: Pushing hg changeset 506855c73b7c4665aede50d731ba850c425a096d for ab8333b4fa6835186f1882f95ebeab509eb974eb -WARNING: Pushing hg changeset c93db0cacb17c8d8b827434fa4e3682b3b9a4f83 for 81140b4c4d148b226b57f499a417db3c49b0ce6a -WARNING: Pushing hg changeset fdf18ed31033fe7268c0271d1df77d4355a9f08c for f3408dd3fe863bae3ab3214b708cd6fc2742e40b + fffffff..0a08bbd master -> master +WARNING: Pushing hg changeset 83e4f0d480572b29216959fab0f79fa569b8d43d for 86aef2af28fea46f76301bae3be057b1529cdf2a +WARNING: Pushing hg changeset b038f995534f35df76a739b09fe0b4686e462fca for 091dc45f43b4a79d011967b11726305eafb81f4b +WARNING: Pushing hg changeset 7e77d47976700a1bf10068e28976cbeb111b273a for 05e62cb895dc46602e77677c9e997c926cc8d026 +WARNING: Pushing hg changeset 4097fc4d9cdd3392453e08c8d665c35b7f5af537 for 910baecd56968501c9d0759bdf2f9dbb64d1d9e8 +WARNING: Pushing hg changeset c778e8b47291ff86133752df71de001048f185b8 for 0a08bbdcfba0e40e78584137e327b152597f3376 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 8022a6dc9f71 +new changesets 1558910c0200 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 0980d9251534:97bfb1732f8a +new changesets 3085dfd8ab48:d3cfab5e7297 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 - 9656f8b..27941c9 master -> origin/master - 9656f8b..27941c9 branches/default -> origin/branches/default -HEAD is now at 27941c9 restored + b83e972..b5fe89d master -> origin/master + b83e972..b5fe89d branches/default -> origin/branches/default +HEAD is now at b5fe89d 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 0980d9251534e4ec6340cf91e32b407b8e8ec012 for fd520a651f8413bae4935372c5c5f2cd1a6cdc2d -WARNING: Using hg changeset 4c29c6f642b29338c0d240cdb244a3e22f8fb377 for 5ed73229092e8a3f89b5611cd6faaeb09deb31bc -WARNING: Using hg changeset 0243060a40070b98f7da561fbe2424261e22431d for fbb17d96a315ceb92f73532f1cbb982ec337f1b3 -WARNING: Using hg changeset 0906d8c070354d66f340afe538e1944b18f708ba for a5f4b6eb51e03d25ccfcae7128e13cd75f18601b -WARNING: Using hg changeset 97bfb1732f8a8e0196804cc00e22abf78ccd9791 for 27941c9bb6d3b64fa6f5d9fce50bd02b8ca0d917 +WARNING: Using hg changeset 3085dfd8ab48eed6b3ba9f6ca4755407a8e56cbd for 526ae1b8da97c6f57fabfccd6a976a41eeae18ae +WARNING: Using hg changeset e26fc0199fb036dfda8be6f774d3007ebf99d2d4 for c06eccf573ef101bc2ad48bdaddf98ab4979a506 +WARNING: Using hg changeset dea09b17e4a47bdbe07e08af0d7efd68d70942ec for 985dd2bcb8665e02c658cf47252c69b27c3a8a77 +WARNING: Using hg changeset a1ea2f8d92b76f9f62636f96a0b4a66f1333e66b for 92e1dcc50c5d2b65faf540124330c0b5db126d54 +WARNING: Using hg changeset d3cfab5e7297954fa76a82a048937e11d6f7791b for b5fe89d2a1763cfd62072700ad42523e83c845df 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..27941c9 master -> master -WARNING: Using hg changeset 0980d9251534e4ec6340cf91e32b407b8e8ec012 for fd520a651f8413bae4935372c5c5f2cd1a6cdc2d -WARNING: Using hg changeset 4c29c6f642b29338c0d240cdb244a3e22f8fb377 for 5ed73229092e8a3f89b5611cd6faaeb09deb31bc -WARNING: Using hg changeset 0243060a40070b98f7da561fbe2424261e22431d for fbb17d96a315ceb92f73532f1cbb982ec337f1b3 -WARNING: Using hg changeset 0906d8c070354d66f340afe538e1944b18f708ba for a5f4b6eb51e03d25ccfcae7128e13cd75f18601b -WARNING: Using hg changeset 97bfb1732f8a8e0196804cc00e22abf78ccd9791 for 27941c9bb6d3b64fa6f5d9fce50bd02b8ca0d917 + fffffff..b5fe89d master -> master +WARNING: Using hg changeset 3085dfd8ab48eed6b3ba9f6ca4755407a8e56cbd for 526ae1b8da97c6f57fabfccd6a976a41eeae18ae +WARNING: Using hg changeset e26fc0199fb036dfda8be6f774d3007ebf99d2d4 for c06eccf573ef101bc2ad48bdaddf98ab4979a506 +WARNING: Using hg changeset dea09b17e4a47bdbe07e08af0d7efd68d70942ec for 985dd2bcb8665e02c658cf47252c69b27c3a8a77 +WARNING: Using hg changeset a1ea2f8d92b76f9f62636f96a0b4a66f1333e66b for 92e1dcc50c5d2b65faf540124330c0b5db126d54 +WARNING: Using hg changeset d3cfab5e7297954fa76a82a048937e11d6f7791b for b5fe89d2a1763cfd62072700ad42523e83c845df 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 cfa9c9d0bde1 +new changesets ae3e19c2cd6e 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 Sep 25 01:35 . -drwxr-xr-x 8 pbuilder1 pbuilder1 280 Sep 25 01:35 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Sep 25 01:35 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 25 01:35 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 25 01:35 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 . +drwxr-xr-x 8 pbuilder2 pbuilder2 280 Oct 28 08:01 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 28 08:01 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 28 08:01 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Sep 25 01:35 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Sep 25 01:35 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Oct 28 08:01 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Sep 25 01:35 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Sep 25 01:35 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Oct 28 08:01 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 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 392c0aee7868 +new changesets 7d2ab7d26b77 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 Sep 25 01:35 . -drwxr-xr-x 8 pbuilder1 pbuilder1 280 Sep 25 01:35 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Sep 25 01:35 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 25 01:35 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 25 01:35 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 . +drwxr-xr-x 8 pbuilder2 pbuilder2 280 Oct 28 08:01 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 28 08:01 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 28 08:01 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Sep 25 01:35 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Sep 25 01:35 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Oct 28 08:01 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Sep 25 01:35 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Sep 25 01:35 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Oct 28 08:01 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 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 Sep 25 01:35 . -drwxr-xr-x 8 pbuilder1 pbuilder1 280 Sep 25 01:35 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Sep 25 01:35 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Sep 25 01:35 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Sep 25 01:35 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Oct 28 08:01 . +drwxr-xr-x 8 pbuilder2 pbuilder2 280 Oct 28 08:01 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Oct 28 08:01 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Oct 28 08:01 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Sep 25 01:35 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Sep 25 01:35 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Sep 25 01:35 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 25 01:35 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 25 01:35 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Oct 28 08:01 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Oct 28 08:01 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Oct 28 08:01 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 28 08:01 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 28 08:01 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Sep 25 01:35 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Sep 25 01:35 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Sep 25 01:35 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 25 01:35 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 25 01:35 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Oct 28 08:01 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Oct 28 08:01 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Oct 28 08:01 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 28 08:01 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 28 08:01 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 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 b34aaccd32ee +new changesets b817495e8294 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 Sep 25 01:35 . -drwxr-xr-x 8 pbuilder1 pbuilder1 280 Sep 25 01:35 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Sep 25 01:35 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Sep 25 01:35 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Sep 25 01:35 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Oct 28 08:01 . +drwxr-xr-x 8 pbuilder2 pbuilder2 280 Oct 28 08:01 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Oct 28 08:01 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Oct 28 08:01 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Sep 25 01:35 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Sep 25 01:35 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Sep 25 01:35 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 25 01:35 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 25 01:35 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Oct 28 08:01 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Oct 28 08:01 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Oct 28 08:01 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 28 08:01 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 28 08:01 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Sep 25 01:35 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Sep 25 01:35 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Sep 25 01:35 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 25 01:35 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 25 01:35 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Oct 28 08:01 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Oct 28 08:01 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Oct 28 08:01 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 28 08:01 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 28 08:01 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 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 Sep 25 01:35 . -drwxr-xr-x 8 pbuilder1 pbuilder1 280 Sep 25 01:35 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Sep 25 01:35 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Sep 25 01:35 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Sep 25 01:35 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Oct 28 08:01 . +drwxr-xr-x 8 pbuilder2 pbuilder2 280 Oct 28 08:01 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Oct 28 08:01 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Oct 28 08:01 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Sep 25 01:35 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Sep 25 01:35 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Sep 25 01:35 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 25 01:35 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 25 01:35 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Oct 28 08:01 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Oct 28 08:01 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Oct 28 08:01 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 28 08:01 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 28 08:01 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Sep 25 01:35 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Sep 25 01:35 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Sep 25 01:35 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 25 01:35 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 25 01:35 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Oct 28 08:01 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Oct 28 08:01 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Oct 28 08:01 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 28 08:01 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 28 08:01 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 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 Sep 25 01:35 . -drwxr-xr-x 8 pbuilder1 pbuilder1 280 Sep 25 01:35 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Sep 25 01:35 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 25 01:35 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 25 01:35 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 . +drwxr-xr-x 8 pbuilder2 pbuilder2 280 Oct 28 08:01 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 28 08:01 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 28 08:01 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Sep 25 01:35 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Sep 25 01:35 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Oct 28 08:01 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Sep 25 01:35 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Sep 25 01:35 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Sep 25 01:35 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Oct 28 08:01 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Oct 28 08:01 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Oct 28 08:01 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/645059/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/645059/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/2903345 and its subdirectories -I: Current time: Wed Sep 24 13:35:44 -12 2025 -I: pbuilder-time-stamp: 1758764144 +I: removing directory /srv/workspace/pbuilder/645059 and its subdirectories +I: Current time: Wed Oct 28 22:01:57 +14 2026 +I: pbuilder-time-stamp: 1793174517