Diff of the two buildlogs: -- --- b1/build.log 2024-04-20 23:17:48.209386138 +0000 +++ b2/build.log 2024-04-20 23:20:54.193420993 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Sat Apr 20 11:12:19 -12 2024 -I: pbuilder-time-stamp: 1713654739 +I: Current time: Sat May 24 19:40:50 +14 2025 +I: pbuilder-time-stamp: 1748065250 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz] I: copying local configuration @@ -28,54 +28,86 @@ dpkg-source: info: applying 1001_testsuite_UTF-8.patch I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/20952/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/80707/tmp/hooks/D01_modify_environment starting +debug: Running on ionos16-i386. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +'/bin/sh' -> '/bin/bash' +lrwxrwxrwx 1 root root 9 May 24 05:40 /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/80707/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/80707/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='i386' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=11 ' - DISTRIBUTION='unstable' - HOME='/root' - HOST_ARCH='i386' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="2" [2]="21" [3]="1" [4]="release" [5]="i686-pc-linux-gnu") + BASH_VERSION='5.2.21(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=i386 + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=21 ' + DIRSTACK=() + DISTRIBUTION=unstable + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=i686 + HOST_ARCH=i386 IFS=' ' - INVOCATION_ID='dccd51ede84a41e8bbb823b9b33e44bc' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - LD_LIBRARY_PATH='/usr/lib/libeatmydata' - LD_PRELOAD='libeatmydata.so' - 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='20952' - PS1='# ' - PS2='> ' + INVOCATION_ID=fac298f101c8415ca0ab5fc8b021fac5 + LANG=C + LANGUAGE=de_CH:de + LC_ALL=C + LD_LIBRARY_PATH=/usr/lib/libeatmydata + LD_PRELOAD=libeatmydata.so + MACHTYPE=i686-pc-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=80707 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.cVccvOw1/pbuilderrc_zpue --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.cVccvOw1/b1 --logfile b1/build.log git-remote-hg_1.0.4~ds-1.dsc' - SUDO_GID='112' - SUDO_UID='107' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://46.16.76.132: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.cVccvOw1/pbuilderrc_aBoI --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.cVccvOw1/b2 --logfile b2/build.log git-remote-hg_1.0.4~ds-1.dsc' + SUDO_GID=112 + SUDO_UID=107 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://213.165.73.152:3128 I: uname -a - Linux ionos12-i386 6.1.0-20-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.85-1 (2024-04-11) x86_64 GNU/Linux + Linux i-capture-the-hostname 6.1.0-20-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.85-1 (2024-04-11) x86_64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Apr 19 07:43 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/20952/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 May 23 14:06 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/80707/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -213,7 +245,7 @@ Get: 84 http://deb.debian.org/debian unstable/main i386 mercurial-git all 1.0.3-1 [63.5 kB] Get: 85 http://deb.debian.org/debian unstable/main i386 sharness all 1.0.0-1.1 [28.6 kB] Get: 86 http://deb.debian.org/debian unstable/main i386 xmlto i386 0.0.28-2.1 [33.9 kB] -Fetched 45.4 MB in 1s (60.3 MB/s) +Fetched 45.4 MB in 0s (92.5 MB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libpython3.11-minimal:i386. (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 ... 19681 files and directories currently installed.) @@ -507,8 +539,8 @@ Setting up tzdata (2024a-3) ... Current default time zone: 'Etc/UTC' -Local time is now: Sat Apr 20 23:12:48 UTC 2024. -Universal Time is now: Sat Apr 20 23:12:48 UTC 2024. +Local time is now: Sat May 24 05:41:12 UTC 2025. +Universal Time is now: Sat May 24 05:41:12 UTC 2025. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17029-2) ... @@ -592,7 +624,11 @@ Building tag database... -> Finished parsing the build-deps I: Building the package -I: Running cd /build/reproducible-path/git-remote-hg-1.0.4~ds/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S > ../git-remote-hg_1.0.4~ds-1_source.changes +I: user script /srv/workspace/pbuilder/80707/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for unstable +I: user script /srv/workspace/pbuilder/80707/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/reproducible-path/git-remote-hg-1.0.4~ds/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S > ../git-remote-hg_1.0.4~ds-1_source.changes dpkg-buildpackage: info: source package git-remote-hg dpkg-buildpackage: info: source version 1.0.4~ds-1 dpkg-buildpackage: info: source distribution unstable @@ -602,7 +638,7 @@ debian/rules clean dh clean dh_auto_clean - make -j11 clean + make -j21 clean make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' rm -f doc/git-remote-hg.1 rm -f -r bin/ @@ -614,7 +650,7 @@ dh_autoreconf dh_auto_configure dh_auto_build - make -j11 "INSTALL=install --strip-program=true" + make -j21 "INSTALL=install --strip-program=true" make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then \ : Use chosen Python version ; \ @@ -638,7 +674,7 @@ a2x -d manpage -f manpage doc/git-remote-hg.txt make[1]: Leaving directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' dh_auto_test - make -j11 test + make -j21 test make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' make -C test make[2]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds/test' @@ -659,6 +695,15 @@ 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*" && ( @@ -703,15 +748,6 @@ 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(+) @@ -730,12 +766,13 @@ create mode 100644 delta /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 4 files +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 4 Änderungssätze mit 4 Änderungen an 4 Dateien hinzu +Cloning into 'gitrepo'... ok 1 - setup expecting success: @@ -752,34 +789,33 @@ check gitrepo HEAD zero Cloning into 'gitrepo'... -Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 0e58c130d5b2 -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 -adding changesets -new changesets 0e58c130d5b2 -adding manifests -adding file changes +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 2b9be847bdf9 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 2b9be847bdf9 +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 2b9be847bdf9 progress revision walk 'bookmarks/master' (0/0) -added 1 changesets with 1 changes to 1 files progress revision 0 'master' (0/1) -new changesets 0e58c130d5b2 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 2 - cloning @@ -814,16 +850,16 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 4 files +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 4 Änderungssätze mit 4 Änderungen an 4 Dateien hinzu new changesets 1e3e49d2cc8f:6674f1c866b5 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) -marked working directory as branch next +Arbeitsverzeichnis wurde als Zweig next markiert (branches are permanent and global, did you want a bookmark?) -marked working directory as branch next +Arbeitsverzeichnis wurde als Zweig next markiert (branches are permanent and global, did you want a bookmark?) origin ok 1 - subcommand help @@ -849,32 +885,32 @@ Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 4 files -adding changesets +Suche nach Änderungen +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 4 Änderungssätze mit 4 Änderungen an 4 Dateien hinzu /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding manifests -adding file changes WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -added 2 changesets with 2 changes to 1 files -new changesets 0e58c130d5b2:8f4b0a693dbc +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets 2b9be847bdf9:4d37cb850410 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu progress revision 1 'next' (0/1) -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 0e58c130d5b2:8f4b0a693dbc +new changesets 2b9be847bdf9:4d37cb850410 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) @@ -911,8 +947,8 @@ check gitrepo origin/feature-a feature-a Cloning into 'gitrepo'... -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (0/0) @@ -950,31 +986,14 @@ test_cmp expected actual +Cloning into 'gitrepo'... [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha -[master 862befc] add beta - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 beta -[master 86bf00d] add foo - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 foo/bar -rm 'alpha' -[master 74dc957] remove alpha - Author: A U Thor - 1 file changed, 1 deletion(-) - delete mode 100644 alpha -rm 'foo/bar' -Cloning into 'gitrepo'... -[master ea36818] remove foo/bar - Author: A U Thor - 1 file changed, 1 deletion(-) - delete mode 100644 foo/bar /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... ok 2 - subcommand repo - no local proxy expecting success: @@ -992,15 +1011,45 @@ test_cmp expected actual -Cloning into 'gitrepo'... +[master 862befc] add beta + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 beta +[master 86bf00d] add foo + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 foo/bar +rm 'alpha' +[master 74dc957] remove alpha + Author: A U Thor + 1 file changed, 1 deletion(-) + delete mode 100644 alpha +rm 'foo/bar' +[master ea36818] remove foo/bar + Author: A U Thor + 1 file changed, 1 deletion(-) + delete mode 100644 foo/bar /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark feature-a -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 0e58c130d5b2:6b85752db333 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens feature-a +Fügte 3 Änderungssätze mit 3 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 2b9be847bdf9:dc64160ba55e +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'next' (0/1) +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens feature-a +Fügte 3 Änderungssätze mit 3 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 2b9be847bdf9:dc64160ba55e progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) @@ -1025,27 +1074,6 @@ check_bookmark hgrepo devel devel -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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 -adding remote bookmark feature-a -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 0e58c130d5b2:6b85752db333 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'next' (0/1) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files ok 4 - cloning with bookmarks expecting success: @@ -1069,61 +1097,85 @@ Cloning into 'gitrepo'... Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Keine Änderungen gefunden Cloning into 'gitrepo'... +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 5 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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 changesets -adding manifests -adding file changes -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark feature-a -adding remote bookmark devel -adding remote bookmark feature-a -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 0e58c130d5b2:6b85752db333 -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 0e58c130d5b2:6b85752db333 -adding changesets -adding manifests -adding file changes +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens devel +Hinzufügen des entfernten Lesezeichens feature-a +Fügte 3 Änderungssätze mit 3 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 2b9be847bdf9:dc64160ba55e progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) -added 1 changesets with 1 changes to 1 files -new changesets 991424cb3053 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens devel +Hinzufügen des entfernten Lesezeichens feature-a +Fügte 3 Änderungssätze mit 3 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 2b9be847bdf9:dc64160ba55e progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files -new changesets 362b656574c3:54f595cbdf1f -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/5) -[devel 9ec2416] devel +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +[devel 306d1c9] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -[devel 9ec2416] devel +[devel 306d1c9] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 579f91219135 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Keine Änderungen gefunden +Keine Änderungen gefunden +Suche nach Änderungen +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Füge Änderungssätze hinzu +Suche nach Änderungen +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 5 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets 362b656574c3:54f595cbdf1f +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/5) ok 3 - subcommand repo - with local proxy expecting success: @@ -1140,22 +1192,6 @@ test_cmp rev-HEAD git-HEAD ) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files ok 5 - update bookmark expecting success: @@ -1173,8 +1209,6 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] ok 5 - update bookmark expecting success: @@ -1192,110 +1226,75 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark feature-a -added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets 0e58c130d5b2:c17ac034094f +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens devel +Hinzufügen des entfernten Lesezeichens feature-a +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 2b9be847bdf9:c61eab0ca2aa progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) 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 0e58c130d5b2:c17ac034094f +[feature-b 94a12b9] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens devel +Hinzufügen des entfernten Lesezeichens feature-a +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 2b9be847bdf9:c61eab0ca2aa +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -[feature-b 7d634ab] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[feature-b 7d634ab] feature-b +Suche nach Änderungen +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 5 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +[feature-b 94a12b9] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 91cdd97eb55c -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -ok 2 - file removal - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - ( - git init -q gitrepo && - cd gitrepo && - git config receive.denyCurrentBranch ignore && - echo alpha > alpha && - git add alpha && - git commit -m "add alpha" && - git tag alpha && - - echo beta > beta && - git add beta && - git commit -m "add beta" && - git tag -a -m "added tag beta" beta - ) && - - hg_clone gitrepo hgrepo && - git_clone hgrepo gitrepo2 && - hg_clone gitrepo2 hgrepo2 && - - hg_log hgrepo > expected && - hg_log hgrepo2 > actual && - - test_cmp expected actual - -[master (root-commit) 223a6f6] add alpha - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 alpha -[master 862befc] add beta - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 beta +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 3e113ddc64c9 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] ok 6 - new bookmark @@ -1362,12 +1361,47 @@ test_cmp expected actual +ok 2 - file removal + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + ( + git init -q gitrepo && + cd gitrepo && + git config receive.denyCurrentBranch ignore && + echo alpha > alpha && + git add alpha && + git commit -m "add alpha" && + git tag alpha && + + echo beta > beta && + git add beta && + git commit -m "add beta" && + git tag -a -m "added tag beta" beta + ) && + + hg_clone gitrepo hgrepo && + git_clone hgrepo gitrepo2 && + hg_clone gitrepo2 hgrepo2 && + + hg_log hgrepo > expected && + hg_log hgrepo2 > actual && + + test_cmp expected actual + +[master (root-commit) 223a6f6] add alpha + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 alpha +[master 862befc] add beta + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 beta /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] ok 4 - subcommands hg-rev and git-rev expecting success: @@ -1407,42 +1441,46 @@ grep "git marks" output ) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -searching for changes -searching for changes /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu +Suche nach Änderungen +Suche nach Änderungen +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu new changesets 362b656574c3:7cd99375c843 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -Cloning into 'gitrepo'... +Suche nach Änderungen +Keine Änderungen gefunden /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 1 files -new changesets 6f6553abc03c:153c189e57c3 +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu +new changesets 8316b656b277:e014625c0dbb progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +Speichere Bündel-Sicherheitskopie in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/9dfba3dba5c1-865e7dcd-backup.hg ok 3 - git tags expecting success: @@ -1481,47 +1519,33 @@ test_cmp expected actual -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/144ee39edc97-18b2127f-backup.hg -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -searching for changes /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 4bafc464a99c +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 8d2487e54be6 progress revision 4 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - + 2f472de...0c645c8 master -> origin/master (forced update) - + 2f472de...0c645c8 branches/default -> origin/branches/default (forced update) -HEAD is now at 0c645c8 four -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + + eca1f8f...d003d12 master -> origin/master (forced update) + + eca1f8f...d003d12 branches/default -> origin/branches/default (forced update) +HEAD is now at d003d12 four +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. 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 +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Suche nach Änderungen +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -added 12 changesets with 12 changes to 1 files -new changesets bb5aa1c75e6a:67634ca81695 -progress revision walk 'bookmarks/master' (11/11) -progress revision 0 'master' (0/12) Loading hg marks ... Loading git marks ... Performing garbage collection on git commits ... @@ -1561,6 +1585,18 @@ test_cmp expected actual +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 12 Änderungssätze mit 12 Änderungen an 1 Dateien hinzu +new changesets fd7e01f457ce:7e4d374b5348 +progress revision walk 'bookmarks/master' (11/11) +progress revision 0 'master' (0/12) ok 7 - authors expecting success: @@ -1602,11 +1638,11 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 12 changesets with 12 changes to 1 files -new changesets bb5aa1c75e6a:67634ca81695 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 12 Änderungssätze mit 12 Änderungen an 1 Dateien hinzu +new changesets fd7e01f457ce:7c99e5b52369 progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) ok 7 - authors @@ -1648,100 +1684,85 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected -marked working directory as branch gamma -Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 5ae87d4ff283 -searching for changes -adding changesets -adding manifests -adding file changes +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets e797071c8745 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -adding remote bookmark not-master +Arbeitsverzeichnis wurde als Zweig gamma markiert +Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -added 2 changesets with 1 changes to 1 files +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets 49d271b35b09:a5c69c2effc9 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens not-master +Fügte 2 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu new changesets 5889597089fe:3320583a8de0 1 local changesets published progress revision 1 'default' (0/1) progress revision 2 'gamma' (0/1) -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 7bb7c8ff7b20:95035af24282 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets f99010379402 +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + b5240b3..b29140d master -> origin/master + b5240b3..b29140d branches/default -> origin/branches/default /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 7c7a45d3f456:159acbc094bc +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets 49d271b35b09:e0b8fd7ae978 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo/.hg/strip-backup/95035af24282-2577fbea-backup.hg -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file 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.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/159acbc094bc-8edb170e-backup.hg -added 1 changesets with 1 changes to 1 files -new changesets f14e168e0611 -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - e094ad3..da25d37 master -> origin/master - e094ad3..da25d37 branches/default -> origin/branches/default +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +Speichere Bündel-Sicherheitskopie in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo/.hg/strip-backup/a5c69c2effc9-a9e71d15-backup.hg +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +Speichere Bündel-Sicherheitskopie in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/e0b8fd7ae978-fabd5403-backup.hg /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 0 changes to 0 files -searching for changes -searching for changes +Suche nach Änderungen +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 0 Änderungen an 0 Dateien hinzu +Suche nach Änderungen /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: 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 -added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets 22bd6fb7c106:8d65938ab3b8 -progress revision 2 'default' (0/2) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - + f1105ee...6b9151f master -> origin/master (forced update) - + f1105ee...6b9151f branches/default -> origin/branches/default (forced update) +Suche nach Änderungen ok 6 - subcommand [some-repo] expecting success: @@ -1776,20 +1797,37 @@ check gitrepo/sub_hg_b HEAD zero_sub_hg_b && check gitrepo/sub_git HEAD zero_sub_git +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 8342cebe0b29:d0d8dd5699ad /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets f7e74cac7f94:5562ea00da3c progress revision 2 'default' (0/2) +0 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 4969bcd59efe:3e89b73b4491 +progress revision 2 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo + + b9fe84f...98b3cc1 master -> origin/master (forced update) + + b9fe84f...98b3cc1 branches/default -> origin/branches/default (forced update) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - + c8c7ca0...8f318ab master -> origin/master (forced update) - + c8c7ca0...8f318ab branches/default -> origin/branches/default (forced update) + + 690c040...96e41f9 master -> origin/master (forced update) + + 690c040...96e41f9 branches/default -> origin/branches/default (forced update) +ok 8 - strip ok 8 - strip + expecting success: test_when_finished "rm -rf hgrepo gitrepo*" && @@ -1814,8 +1852,6 @@ check_branch hgrepo default two -ok 8 - strip - expecting success: test_when_finished "rm -rf hgrepo gitrepo*" && @@ -1840,7 +1876,63 @@ check_branch hgrepo default two -ok 4 - hg branch +--- expected 2025-05-24 05:41:39.077167619 +0000 ++++ actual 2025-05-24 05:41:39.341167619 +0000 +@@ -1,7 +1,7 @@ + Änderung: 2:3320583a8de0b31511f499a4ab3426bee1a7f478 + Zweig: gamma + Marke: tip +-Phase: draft ++Phase: public + Vorgänger: 1:5889597089fea2d144989baa9427d1a080293fdb + Vorgänger: -1:0000000000000000000000000000000000000000 + Manifest: 1:e353b4d5282d044ad738398fd32d0b684d04a14b +@@ -13,7 +13,7 @@ + + + Änderung: 1:5889597089fea2d144989baa9427d1a080293fdb +-Phase: draft ++Phase: public + Vorgänger: 0:362b656574c3c9e89fa7f2d7a943091dc93bce4d + Vorgänger: -1:0000000000000000000000000000000000000000 + Manifest: 1:e353b4d5282d044ad738398fd32d0b684d04a14b +not ok 4 - hg branch +# +# test_when_finished "rm -rf gitrepo* hgrepo*" && +# +# ( +# git init -q gitrepo && +# cd gitrepo && +# +# echo alpha > alpha && +# git add alpha && +# git commit -q -m "add alpha" && +# git checkout -q -b not-master +# ) && +# +# ( +# hg_clone gitrepo hgrepo && +# +# cd hgrepo && +# hg -q co default && +# hg mv alpha beta && +# hg -q commit -m "rename alpha to beta" && +# hg branch gamma | grep -v "permanent and global" && +# hg -q commit -m "started branch gamma" +# ) && +# +# hg_push hgrepo gitrepo && +# hg_clone gitrepo hgrepo2 && +# +# : Back to the common revision && +# (cd hgrepo && hg checkout default) && +# +# # fetch does not affect phase, but pushing now does +# hg_log hgrepo | grep -v phase > expected && +# hg_log hgrepo2 | grep -v phase > actual && +# +# test_cmp expected actual +# expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && @@ -1879,82 +1971,112 @@ create mode 100644 alpha /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -searching for changes +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Suche nach Änderungen +0 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst Cloning into 'gitrepo'... Cloning into 'gitrepo'... -0 files updated, 0 files merged, 0 files removed, 0 files unresolved +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -adding remote bookmark master -added 2 changesets with 2 changes to 1 files -new changesets fcdbdeaddf49:b5433533ba42 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens master +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets 51e45bf48c06:e7824ce87d27 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens master +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets 51e45bf48c06:e7824ce87d27 progress revision walk 'bookmarks/default' (1/1) progress revision 0 'default' (0/2) -[default 2ccdf76] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark master -added 2 changesets with 2 changes to 1 files -new changesets fcdbdeaddf49:b5433533ba42 progress revision walk 'bookmarks/default' (1/1) progress revision 0 'default' (0/2) -[default 2ccdf76] two +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +[default b2adb77] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens not-master +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 16869bbe54be +1 local changesets published +[default b2adb77] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +Cloning into 'gitrepo'... +progress revision 1 'default' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Keine Änderungen gefunden /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git -no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Keine Änderungen gefunden +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets 0e733c36e040:202e5962c703 +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - 2dad075..2ccdf76 default -> default -searching for changes -adding changesets -adding manifests -adding file changes -adding remote bookmark not-master -added 1 changesets with 1 changes to 1 files -new changesets 16869bbe54be -1 local changesets published -progress revision 1 'default' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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 + 6672156..b2adb77 default -> default +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..2ccdf76 default -> default + fffffff..b2adb77 default -> default +Suche nach Änderungen +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu +Suche nach Änderungen +Suche nach Änderungen +To hg::../hgrepo2 + * [new branch] branches/default -> branches/default + * [new branch] master -> master + * [new branch] not-master -> not-master + ! [rejected] alpha -> alpha (already exists) +error: failed to push some refs to 'hg::../hgrepo2' +hint: Updates were rejected because the tag already exists in the remote. +ok 9 - remote push with master bookmark + ok 9 - remote push with master bookmark expecting success: @@ -1978,12 +2100,6 @@ check_branch hgrepo default one -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ -ok 9 - remote push with master bookmark - expecting success: test_when_finished "rm -rf hgrepo gitrepo*" && @@ -2005,68 +2121,63 @@ check_branch hgrepo default one +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Cloning into './sub_hg_a'... +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/gitrepo/.git/ [master (root-commit) 64caca5] one Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -searching for changes -searching for changes -To hg::../hgrepo2 - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] not-master -> not-master - ! [rejected] alpha -> alpha (already exists) -error: failed to push some refs to 'hg::../hgrepo2' -hint: Updates were rejected because the tag already exists in the remote. -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 46a15a5d8db0:dc997a1fad8b -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::../hgrepo - * [new branch] master -> master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -no changes found -Cloning into './sub_hg_a'... -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::../hgrepo - * [new branch] master -> master -ok 5 - hg tags +--- expected 2025-05-24 05:41:42.797167619 +0000 ++++ actual 2025-05-24 05:41:43.061167619 +0000 +@@ -1,6 +1,6 @@ + Änderung: 1:16869bbe54be9f8082a8aec346de09f6c05cf1de + Marke: tip +-Phase: draft ++Phase: public + Vorgänger: 0:362b656574c3c9e89fa7f2d7a943091dc93bce4d + Vorgänger: -1:0000000000000000000000000000000000000000 + Manifest: 1:26f8145fb5b20cc6f70dd131b646f95ab79738c0 +not ok 5 - hg tags +# +# test_when_finished "rm -rf gitrepo* hgrepo*" && +# +# ( +# git init -q gitrepo && +# cd gitrepo && +# +# echo alpha > alpha && +# git add alpha && +# git commit -m "add alpha" && +# git checkout -q -b not-master +# ) && +# +# ( +# hg_clone gitrepo hgrepo && +# +# cd hgrepo && +# hg co default && +# hg tag alpha +# ) && +# +# hg_push hgrepo gitrepo && +# # pushing a fetched tag is a problem ... +# { hg_clone gitrepo hgrepo2 || true ; } && +# +# # fetch does not affect phase, but pushing now does +# hg_log hgrepo | grep -v phase > expected && +# hg_log hgrepo2 | grep -v phase > actual && +# +# test_cmp expected actual +# expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && @@ -2110,12 +2221,6 @@ Date: Mon Jan 1 00:00:00 2007 +0000 1 file changed, 1 insertion(+) create mode 100644 alpha -changeset: 0:6e2126489d3d -tag: tip -user: A U Thor -date: Mon Jan 01 00:00:00 2007 +0230 -summary: one - [master ea3e397] add beta Author: A U Thor Date: Mon Jan 1 00:00:00 2007 +0100 @@ -2138,21 +2243,95 @@ create mode 100644 epsilon /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -changeset: 0:6e2126489d3d -tag: tip -user: A U Thor -date: Mon Jan 01 00:00:00 2007 +0230 -summary: one - -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 5cf3c6cd4434 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 525117811882 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways Cloning into './sub_hg_b'... -ok 10 - remote push from master branch +Keine Änderungen gefunden +Keine Änderungen gefunden +Suche nach Änderungen +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +To hg::../hgrepo + * [new branch] master -> master +To hg::../hgrepo + * [new branch] master -> master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Keine Änderungen gefunden +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 705b429e625e +Suche nach Änderungen +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Änderung: 0:6e2126489d3d +Marke: tip +Nutzer: A U Thor +Datum: Mon Jan 01 00:00:00 2007 +0230 +Zusammenfassung: one + +Fügte 5 Änderungssätze mit 5 Änderungen an 5 Dateien hinzu +--- expected 2025-05-24 05:41:42.777167619 +0000 ++++ actual 2025-05-24 05:41:43.693167619 +0000 +@@ -1,6 +1,6 @@ +-changeset: 0:6e2126489d3d +-tag: tip +-user: A U Thor +-date: Mon Jan 01 00:00:00 2007 +0230 +-summary: one ++Änderung: 0:6e2126489d3d ++Marke: tip ++Nutzer: A U Thor ++Datum: Mon Jan 01 00:00:00 2007 +0230 ++Zusammenfassung: one + +not ok 10 - remote push from master branch +# +# test_when_finished "rm -rf hgrepo gitrepo*" && +# +# hg init hgrepo && +# +# ( +# git init gitrepo && +# cd gitrepo && +# git remote add origin "hg::../hgrepo" && +# echo one > content && +# git add content && +# git commit -a -m one && +# git push origin master +# ) && +# +# hg -R hgrepo log > actual && +# cat actual && +# test_cmp expected actual && +# +# check_branch hgrepo default one +# expecting success: test_when_finished "rm -rf gitrepo*" && @@ -2168,7 +2347,48 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero -ok 10 - remote push from master branch +Änderung: 0:6e2126489d3d +Marke: tip +Nutzer: A U Thor +Datum: Mon Jan 01 00:00:00 2007 +0230 +Zusammenfassung: one + +--- expected 2025-05-24 05:41:42.777167619 +0000 ++++ actual 2025-05-24 05:41:43.721167619 +0000 +@@ -1,6 +1,6 @@ +-changeset: 0:6e2126489d3d +-tag: tip +-user: A U Thor +-date: Mon Jan 01 00:00:00 2007 +0230 +-summary: one ++Änderung: 0:6e2126489d3d ++Marke: tip ++Nutzer: A U Thor ++Datum: Mon Jan 01 00:00:00 2007 +0230 ++Zusammenfassung: one + +not ok 10 - remote push from master branch +# +# test_when_finished "rm -rf hgrepo gitrepo*" && +# +# hg init hgrepo && +# +# ( +# git init gitrepo && +# cd gitrepo && +# git remote add origin "hg::../hgrepo" && +# echo one > content && +# git add content && +# git commit -a -m one && +# git push origin master +# ) && +# +# hg -R hgrepo log > actual && +# cat actual && +# test_cmp expected actual && +# +# check_branch hgrepo default one +# expecting success: test_when_finished "rm -rf gitrepo*" && @@ -2184,23 +2404,6 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 4b2d7a844956 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files Cloning into './sub_git'... done. ok 7 - subcommand sub initial update (hg and git subrepos) @@ -2228,28 +2431,37 @@ 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.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] Cloning into 'gitrepo'... Cloning into 'gitrepo'... +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 5 Änderungssätze mit 5 Änderungen an 5 Dateien hinzu +new changesets 87c8f82b00d0:21e96c99dac4 +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/5) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets c2543fe1f234 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 8ee8720a851e +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 8ee8720a851e +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) -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files -new changesets 87c8f82b00d0:21e96c99dac4 -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/5) ok 11 - remote cloning expecting success: @@ -2262,16 +2474,6 @@ git fetch ) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets c2543fe1f234 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) ok 11 - remote cloning expecting success: @@ -2285,42 +2487,44 @@ ) Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Suche nach Änderungen +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 5 Änderungssätze mit 5 Änderungen an 5 Dateien hinzu /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets c2543fe1f234 +Füge Änderungssätze hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 8ee8720a851e +new changesets 8ee8720a851e +progress revision walk 'bookmarks/master' (0/0) progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets c2543fe1f234 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Keine Änderungen gefunden +Keine Änderungen gefunden ok 12 - moving remote clone expecting success: @@ -2342,7 +2546,6 @@ check_bookmark hgrepo devel devel -no changes found ok 12 - moving remote clone expecting success: @@ -2368,54 +2571,56 @@ Cloning into 'gitrepo'... ok 6 - test timezones +# failed 2 among 6 test(s) +1..6 +make[2]: *** [Makefile:14: bidi.t] Error 1 +make[2]: *** Waiting for unfinished jobs.... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -# passed all 6 test(s) -1..6 WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -added 1 changesets with 1 changes to 1 files -new changesets c2543fe1f234 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -[devel 1d87e26] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -added 1 changesets with 1 changes to 1 files -new changesets c2543fe1f234 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens devel +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 8ee8720a851e +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel 1d87e26] devel +Hinzufügen des entfernten Lesezeichens devel +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 8ee8720a851e +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[devel f196d9b] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[devel f196d9b] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +Keine Änderungen gefunden +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu ok 13 - remote update bookmark expecting success: @@ -2450,57 +2655,57 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -added 2 changesets with 2 changes to 1 files -new changesets c2543fe1f234:6cc0e6451e81 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -[feature-b c33741b] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -added 2 changesets with 2 changes to 1 files -new changesets c2543fe1f234:6cc0e6451e81 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens devel +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets 8ee8720a851e:787ac50d21e0 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens devel +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets 8ee8720a851e:787ac50d21e0 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[feature-b c33741b] feature-b +[feature-b cce8b65] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -[master (root-commit) e9a16bb] zero_sub_git +[feature-b cce8b65] feature-b Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu ok 14 - remote new bookmark expecting success: @@ -2527,10 +2732,6 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways ok 14 - remote new bookmark expecting success: @@ -2557,71 +2758,74 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... -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 c2543fe1f234:12c7b77950c9 Cloning into 'gitrepo'... -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -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 c2543fe1f234:12c7b77950c9 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens devel +Hinzufügen des entfernten Lesezeichens feature-b +Fügte 3 Änderungssätze mit 3 Änderungen an 1 Dateien hinzu +new changesets 8ee8720a851e:420800efe08b progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 42865e33392b:60d5e075c788 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens devel +Hinzufügen des entfernten Lesezeichens feature-b +Fügte 3 Änderungssätze mit 3 Änderungen an 1 Dateien hinzu +new changesets 8ee8720a851e:420800efe08b +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets 910badb835ba:7f871fa69450 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 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst (leaving bookmark devel) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst (leaving bookmark devel) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp Cloning into './sub_hg_a'... -[master cce37d4] diverged +[master 6a4f145] diverged Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -[master cce37d4] diverged +[master 6a4f145] diverged Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg: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 fe3ec852cc74:ff7401fe39e4 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets c19ff4824d91:14fd4a804afe progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into './sub_hg_a/sub_hg_a_x'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: 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 cf9a01279f4f +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets edec4ca640dc To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo' @@ -2632,12 +2836,12 @@ ! [rejected] master -> master (non-fast-forward) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets cf9a01279f4f +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets edec4ca640dc To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo' @@ -2646,6 +2850,7 @@ hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] master -> master (non-fast-forward) +Cloning into './sub_hg_a/sub_hg_a_x'... ok 15 - remote push diverged expecting success: @@ -2677,15 +2882,6 @@ check_bookmark hgrepo diverge "bump bookmark" -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets b6383968e299 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) ok 15 - remote push diverged expecting success: @@ -2717,36 +2913,35 @@ check_bookmark hgrepo diverge "bump bookmark" -Cloning into './sub_hg_b'... -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets afc39c33432c +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +Cloning into './sub_hg_b'... Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets f78c728e55a2:bb91b473a881 +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets dd8483c3ea40:1116e150eb5f progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... +Cloning into './sub_hg_b/sub_git'... +done. /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -Cloning into './sub_hg_b/sub_git'... -done. -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -added 4 changesets with 4 changes to 1 files -new changesets c2543fe1f234:cf9a01279f4f -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/4) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] ok 8 - subcommand sub initial recursive update @@ -2756,35 +2951,45 @@ test_sub_update -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -added 4 changesets with 4 changes to 1 files -new changesets c2543fe1f234:cf9a01279f4f +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens devel +Hinzufügen des entfernten Lesezeichens diverge +Hinzufügen des entfernten Lesezeichens feature-b +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu +new changesets 8ee8720a851e:edec4ca640dc +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens devel +Hinzufügen des entfernten Lesezeichens diverge +Hinzufügen des entfernten Lesezeichens feature-b +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu +new changesets 8ee8720a851e:edec4ca640dc progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) -created new head -[diverge d4bcd95] diverge +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/4) +neuer Kopf erzeugt +neuer Kopf erzeugt +[diverge 7b6b298] diverge Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -created new head -[diverge d4bcd95] diverge +[diverge 7b6b298] diverge Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -searching for changes -adding changesets -adding manifests -adding file changes -updating bookmark diverge -added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 71bad5628b51 +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Aktualisiere Lesezeichen diverge +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 20c7e3d2d475 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo ! [rejected] diverge -> diverge (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo' @@ -2795,13 +3000,13 @@ ! [rejected] diverge -> diverge (non-fast-forward) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -updating bookmark diverge -added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 71bad5628b51 +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Aktualisiere Lesezeichen diverge +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 20c7e3d2d475 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo ! [rejected] diverge -> diverge (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo' @@ -2844,61 +3049,61 @@ check_bookmark hgrepo feature-c feature-c Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets c2543fe1f234:71bad5628b51 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Hinzufügen des entfernten Lesezeichens devel +Hinzufügen des entfernten Lesezeichens diverge +Hinzufügen des entfernten Lesezeichens feature-b +Füge Dateiänderungen hinzu +Fügte 5 Änderungssätze mit 5 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 8ee8720a851e:20c7e3d2d475 +Hinzufügen des entfernten Lesezeichens devel +Hinzufügen des entfernten Lesezeichens diverge +Hinzufügen des entfernten Lesezeichens feature-b +Fügte 5 Änderungssätze mit 5 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 8ee8720a851e:20c7e3d2d475 WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/4) -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets c2543fe1f234:71bad5628b51 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 c38f933] feature-c +[feature-c 053a2de] feature-c Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -[feature-c c38f933] feature-c +[feature-c 053a2de] feature-c Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) +Keine Änderungen gefunden +Keine Änderungen gefunden +Suche nach Änderungen +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) ok 17 - remote new bookmark multiple branch head -expecting success: +checking known breakage: test_when_finished "rm -rf gitrepo hgrepo" && ( @@ -2937,7 +3142,7 @@ ok 17 - remote new bookmark multiple branch head -checking known breakage: +expecting success: test_when_finished "rm -rf gitrepo hgrepo" && ( @@ -2976,71 +3181,71 @@ Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets f3cf1cfad877 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets e40bf7cbdbed +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu 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 f3cf1cfad877 +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets e40bf7cbdbed progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 1decf36] copy +[master 17f087d] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master 2d95187] moved +[master 868b0ee] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) -[master 1decf36] copy +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master 17f087d] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master 2d95187] moved - Author: A U Thor - 1 file changed, 0 insertions(+), 0 deletions(-) - rename content-copy => content-moved (100%) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ [master (root-commit) e9a16bb] zero_sub_git Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content_sub_git +[master 868b0ee] moved + Author: A U Thor + 1 file changed, 0 insertions(+), 0 deletions(-) + rename content-copy => content-moved (100%) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -added 2 changesets with 2 changes to 2 files +Keine Änderungen gefunden +Keine Änderungen gefunden +Suche nach Änderungen +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - a909484..2d95187 master -> master + 6ee9287..868b0ee master -> master +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..2d95187 master -> master -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved + fffffff..868b0ee master -> master +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst not ok 18 - push commits with copy and rename # TODO known breakage expecting success: @@ -3073,7 +3278,44 @@ echo "ø~?" > expected && test_cmp expected actual -ok 18 - push commits with copy and rename +not ok 18 - push commits with copy and rename +# +# test_when_finished "rm -rf gitrepo hgrepo" && +# +# ( +# hg init hgrepo && +# cd hgrepo && +# echo zero > content && +# hg add content && +# hg commit -m zero +# ) && +# +# git clone "hg::hgrepo" gitrepo && +# +# ( +# cd gitrepo && +# cp content content-copy && +# # recent git-fast-export is (too) picky in recognizing copies +# # although git-log is not as picky; +# # since https://github.com/git/git/commit/8096e1d385660c159d9d47e69b2be63cf22e4f31 +# # a copy is only marked if source filed not modified as well +# # (though destination file can be modified) +# echo one >> content-copy && +# git add content content-copy && +# git commit -m copy && +# git mv content-copy content-moved +# git commit -m moved && +# git push origin master +# ) && +# +# ( +# hg -R hgrepo update && +# test_cmp gitrepo/content hgrepo/content +# test_cmp gitrepo/content-moved hgrepo/content-moved +# cd hgrepo && +# test `hg log -f content-moved | grep -c changeset` -eq 3 +# ) +# expecting success: test_when_finished "rm -rf hgrepo gitrepo && LC_ALL=C" && @@ -3108,15 +3350,15 @@ Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 07067cc71244:7fefe260324c +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets 9c16423be437:eec77a392b10 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -warning: filename contains '?', which is reserved on Windows: 'ø~?' -warning: filename contains '?', which is reserved on Windows: 'ø~?' +Warnung: Dateiname enthält '?', was in Windows reserviert ist: 'ø~?' +Warnung: Dateiname enthält '?', was in Windows reserviert ist: 'ø~?' /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses @@ -3124,48 +3366,55 @@ Cloning into './sub_hg_a'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 2cfb038bb432:7104eab1150a +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets 8f1656899a98:42c568b4b061 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into './sub_hg_a/sub_hg_a_x'... -warning: filename contains '?', which is reserved on Windows: 'ø~?' /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets e1c30453aa81 +Warnung: Dateiname enthält '?', was in Windows reserviert ist: 'ø~?' +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets b02714d1525e +Warnung: Dateiname enthält '?', was in Windows reserviert ist: 'ø~?' progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) Cloning into './sub_hg_b'... -warning: filename contains '?', which is reserved on Windows: 'ø~?' +Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 39adc98d2df7:2a1619606c31 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets c3096a35f8da:8fadb407f2ef progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 3 changesets with 4 changes to 2 files -new changesets e6c3b6d8dad2:990be0aef67e -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 3 Änderungssätze mit 4 Änderungen an 2 Dateien hinzu +new changesets 6e4e7ab37137:50dcf32b7814 Cloning into './sub_hg_b/sub_git'... +Füge Änderungssätze hinzu +Füge Manifeste hinzu done. +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +Füge Dateiänderungen hinzu +Fügte 3 Änderungssätze mit 4 Änderungen an 2 Dateien hinzu +new changesets 6e4e7ab37137:50dcf32b7814 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) ok 19 - fetch special filenames expecting success: @@ -3204,13 +3453,6 @@ printf "content\næ rø\n" > expected && test_cmp expected actual -adding changesets -adding manifests -adding file changes -added 3 changesets with 4 changes to 2 files -new changesets 21d130d2dcec:384c3db15771 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) ok 19 - fetch special filenames expecting success: @@ -3253,81 +3495,81 @@ Cloning into 'gitrepo'... WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets bd5d36310c74 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 1d05f556bc14 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 1d05f556bc14 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -[master 305c643] utf-8 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 11444cd] utf-8 Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 "\303\246 r\303\270" -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets c50014cb6582 +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +[master 11444cd] utf-8 + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 "\303\246 r\303\270" +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 65827f511259 progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 4fbb01e..8ee7565 master -> origin/master - 4fbb01e..8ee7565 branches/default -> origin/branches/default -Updating 4fbb01e..8ee7565 + 973e61d..d92fccb master -> origin/master + 973e61d..d92fccb branches/default -> origin/branches/default +Updating 973e61d..d92fccb Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets bd5d36310c74 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master 305c643] 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 +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Keine Änderungen gefunden +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 2cb5603..11444cd master -> master +Suche nach Änderungen /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..11444cd master -> master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 5dd1729..305c643 master -> master -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..305c643 master -> master +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -1 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 bb5df1658332 +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 71d866e70b37 progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - 25a8066..9df925e branches/default -> origin/branches/default - 25a8066..9df925e master -> origin/master -HEAD is now at 25a8066 substate_hg_a -1 files updated, 0 files merged, 0 files removed, 0 files unresolved + 2698d11..533fad7 branches/default -> origin/branches/default + 2698d11..533fad7 master -> origin/master +HEAD is now at 2698d11 substate_hg_a ok 20 - push special filenames expecting success: @@ -3420,20 +3662,20 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 2b4587619a47 +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 9897ef8d60bf progress revision 1 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 2db5224..f578e3c branches/default -> origin/branches/default - 2db5224..f578e3c master -> origin/master -HEAD is now at 2db5224 zero_sub_hg_a_x + c9077f6..8b836d5 branches/default -> origin/branches/default + c9077f6..8b836d5 master -> origin/master +HEAD is now at c9077f6 zero_sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden ok 9 - subcommand sub subsequent recursive update expecting success: @@ -3442,50 +3684,55 @@ test_sub_update --rebase Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] 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 bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets d0c26c25f109:87a92edea46a +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens bad_bmark1 +Hinzufügen des entfernten Lesezeichens bad_bmark2 +Hinzufügen des entfernten Lesezeichens good_bmark +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu +new changesets 515feb805b34:2363376a8346 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens bad_bmark1 +Hinzufügen des entfernten Lesezeichens bad_bmark2 +Hinzufügen des entfernten Lesezeichens good_bmark +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu +new changesets 515feb805b34:2363376a8346 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 8690a10 zero -HEAD is now at 8690a10 zero -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -HEAD is now at 57137d7 good branch -adding changesets -adding manifests -adding file changes -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets d0c26c25f109:7ebed4801d77 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 8690a10 zero -HEAD is now at 8690a10 zero -HEAD is now at c2aa26f good branch +HEAD is now at cf95478 zero +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +HEAD is now at cf95478 zero +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +HEAD is now at cf95478 zero +HEAD is now at cf95478 zero +HEAD is now at 0f9bb3e good branch +HEAD is now at 0f9bb3e good branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found +Keine Änderungen gefunden To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 57137d7..7ed8f1e branches/good_branch -> branches/good_branch - dcf127f..3c4bee2 good_bmark -> good_bmark - dcf127f..94a7a63 master -> master + 0f9bb3e..c932014 branches/good_branch -> branches/good_branch + 4f433a6..adb09dd good_bmark -> good_bmark + 4f433a6..126745c 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) @@ -3496,51 +3743,46 @@ 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. - dcf127f..94a7a63 master -> master - dcf127f..3c4bee2 good_bmark -> good_bmark - 57137d7..7ed8f1e branches/good_branch -> branches/good_branch + 4f433a6..126745c master -> master + 4f433a6..adb09dd good_bmark -> good_bmark + 0f9bb3e..c932014 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu (+1 Köpfe) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..384d3b0 branches/good_branch -> branches/good_branch - fffffff..5d208f5 good_bmark -> good_bmark - fffffff..4f42afc master -> master + fffffff..c932014 branches/good_branch -> branches/good_branch + fffffff..adb09dd good_bmark -> good_bmark + fffffff..126745c 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) @@ -3551,9 +3793,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..4f42afc master -> master - fffffff..5d208f5 good_bmark -> good_bmark - fffffff..384d3b0 branches/good_branch -> branches/good_branch + fffffff..126745c master -> master + fffffff..adb09dd good_bmark -> good_bmark + fffffff..c932014 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) @@ -3562,11 +3804,11 @@ Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets f47cd2a0c3e3:2572183b1faf +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets 70d092517c0d:84651147aa23 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -3574,6 +3816,28 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp Cloning into './sub_hg_a'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets 720801ee2839:a0d93110654e +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_a/sub_hg_a_x'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets ba6615f40e67 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_hg_b'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 21 - remote big push expecting success: @@ -3650,16 +3914,13 @@ fi ) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 44543cc54c2a:f2e74e99f19a +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets 18cb1c8c4813:7960b8d486ef progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into './sub_hg_a/sub_hg_a_x'... ok 21 - remote big push expecting success: @@ -3736,117 +3997,108 @@ fi ) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets cb344ce76f0b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 851b51d01c04:cc378ef3d611 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) Cloning into './sub_hg_b/sub_git'... done. /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 928df6fc41ae +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 2296bff7e776 progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 464e639..f72c96d master -> origin/master - 464e639..f72c96d branches/default -> origin/branches/default -Updating 464e639..f72c96d + 8ed1739..ab017bd master -> origin/master + 8ed1739..ab017bd branches/default -> origin/branches/default +Updating 8ed1739..ab017bd Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 136224347a1c +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a + 7b9e8a0..869986a branches/default -> origin/branches/default + 7b9e8a0..869986a master -> origin/master +Cloning into 'gitrepo'... +HEAD is now at 7b9e8a0 substate_hg_a + Successfully rebased and updated detached HEAD. +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -Cloning into 'gitrepo'... -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 f48f482a6e41:24739e06cd5d +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 15ffe2532a6e +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +progress revision 1 'default' (0/1) +Hinzufügen des entfernten Lesezeichens bad_bmark +Hinzufügen des entfernten Lesezeichens good_bmark +Fügte 3 Änderungssätze mit 3 Änderungen an 1 Dateien hinzu +new changesets 224535134b1d:d6d9274b60e7 +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + fbbeab2..3ad4b7e branches/default -> origin/branches/default + fbbeab2..3ad4b7e master -> origin/master progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'bad_branch' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 8b600b4ef0a9 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - b9607c1..9ca7366 branches/default -> origin/branches/default - b9607c1..9ca7366 master -> origin/master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -HEAD is now at b9607c1 substate_hg_a - Successfully rebased and updated detached HEAD. -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 f48f482a6e41:203bb7d4a6b6 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens bad_bmark +Hinzufügen des entfernten Lesezeichens good_bmark +Fügte 3 Änderungssätze mit 3 Änderungen an 1 Dateien hinzu +new changesets 224535134b1d:d6d9274b60e7 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'bad_branch' (0/2) +HEAD is now at fbbeab2 zero_sub_hg_a_x + Successfully rebased and updated detached HEAD. /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets d09b55056369 -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - f5b65fa..ce3f124 branches/default -> origin/branches/default - f5b65fa..ce3f124 master -> origin/master -HEAD is now at f5b65fa zero_sub_hg_a_x - Successfully rebased and updated detached HEAD. +Keine Änderungen gefunden +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.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -searching for changes -adding changesets -adding manifests -adding file changes -updating bookmark bad_bmark -added 1 changesets with 1 changes to 1 files -new changesets d7b3bffedfcd +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Aktualisiere Lesezeichen bad_bmark +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 7fdf215e878c To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 03789ec..a49e942 good_bmark -> good_bmark - 03789ec..d4b1db3 master -> master + 4bf5021..f71aa0b good_bmark -> good_bmark + 4bf5021..4129e3c master -> master ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' @@ -3854,53 +4106,32 @@ 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. - 03789ec..d4b1db3 master -> master - 03789ec..a49e942 good_bmark -> good_bmark + 4bf5021..4129e3c master -> master + 4bf5021..f71aa0b good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -progress revision 3 'bad_branch' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 033b04b..2bf0d40 branches/bad_branch -> origin/branches/bad_branch - 03789ec..2bf0d40 bad_bmark -> origin/bad_bmark - + a49e942...03789ec good_bmark -> origin/good_bmark (forced update) - + d4b1db3...03789ec master -> origin/master (forced update) -ok 10 - subcommand sub subsequent recursive update -- rebase - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --merge - /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -updating bookmark bad_bmark -added 1 changesets with 1 changes to 1 files -new changesets 9e11b469310e -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) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Aktualisiere Lesezeichen bad_bmark +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 7fdf215e878c +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..a49e942 good_bmark -> good_bmark - fffffff..d4b1db3 master -> master + fffffff..f71aa0b good_bmark -> good_bmark + fffffff..4129e3c master -> master ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' @@ -3908,20 +4139,40 @@ 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..d4b1db3 master -> master - fffffff..a49e942 good_bmark -> good_bmark + fffffff..4129e3c master -> master + fffffff..f71aa0b good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +Keine Änderungen gefunden +progress revision 3 'bad_branch' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 3ea8876..bbb59f2 branches/bad_branch -> origin/branches/bad_branch + 4bf5021..bbb59f2 bad_bmark -> origin/bad_bmark + + f71aa0b...4bf5021 good_bmark -> origin/good_bmark (forced update) + + 4129e3c...4bf5021 master -> origin/master (forced update) +Keine Änderungen gefunden +Aktualisiere Lesezeichen good_bmark +2 local changesets published +WARNING: Branch 'default' has more than one head, consider merging +progress revision 3 'bad_branch' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + 3ea8876..bbb59f2 branches/bad_branch -> origin/branches/bad_branch + 4bf5021..4129e3c branches/default -> origin/branches/default + 4bf5021..bbb59f2 bad_bmark -> origin/bad_bmark /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found +Keine Änderungen gefunden To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 03789ec..a49e942 good_bmark -> good_bmark - 03789ec..d4b1db3 master -> master + 4bf5021..f71aa0b good_bmark -> good_bmark + 4bf5021..4129e3c master -> master ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' @@ -3929,8 +4180,8 @@ hint: its remote counterpart. If you want to integrate the remote changes, hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 03789ec..d4b1db3 master -> master - 03789ec..a49e942 good_bmark -> good_bmark + 4bf5021..4129e3c master -> master + 4bf5021..f71aa0b good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ok 22 - remote big push non fast forward @@ -3977,18 +4228,9 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six -no changes found -updating bookmark good_bmark -2 local changesets published -WARNING: Branch 'default' has more than one head, consider merging -progress revision 3 'bad_branch' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - b835012..5e01ac7 branches/bad_branch -> origin/branches/bad_branch - 03789ec..d4b1db3 branches/default -> origin/branches/default - 03789ec..5e01ac7 bad_bmark -> origin/bad_bmark /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) @@ -4043,169 +4285,180 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ [master (root-commit) e9a16bb] zero_sub_git Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content_sub_git -adding changesets -adding manifests -adding file changes -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets 729f871b8b85:3339d3642fe8 +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets 9d5e4cd66acc:b64e74e8da6f progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at 5e53848 zero -HEAD is now at 5e53848 zero -HEAD is now at 079ed51 good branch Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Cloning into './sub_hg_a'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -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.4~ds/test/trash directory.main/tmp/hgrepo - + 2138fa3...a50dde0 branches/bad_branch -> branches/bad_branch (forced update) - 079ed51..7e1ad09 branches/good_branch -> branches/good_branch - + b698cff...3ecfeed bad_bmark1 -> bad_bmark1 (forced update) - + b698cff...2480e87 bad_bmark2 -> bad_bmark2 (forced update) - b698cff..0cd9244 good_bmark -> good_bmark - b698cff..0ac6ae9 master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - b698cff..0ac6ae9 master -> master - b698cff..0cd9244 good_bmark -> good_bmark - 079ed51..7e1ad09 branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + b698cff...3ecfeed bad_bmark1 -> bad_bmark1 (forced update) - + b698cff...2480e87 bad_bmark2 -> bad_bmark2 (forced update) - + 2138fa3...a50dde0 branches/bad_branch -> branches/bad_branch (forced update) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... -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 d77ac5fbe36c:3df7a140844a +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens bad_bmark1 +Hinzufügen des entfernten Lesezeichens bad_bmark2 +Hinzufügen des entfernten Lesezeichens good_bmark +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu +new changesets 99461ab262c7:8fb9f790cafb progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at c97ec82 zero -HEAD is now at c97ec82 zero +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens bad_bmark1 +Hinzufügen des entfernten Lesezeichens bad_bmark2 +Hinzufügen des entfernten Lesezeichens good_bmark +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu +new changesets d35e3b7c8f26:3c30c703f071 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 9e25304 zero +HEAD is now at 9e25304 zero +HEAD is now at dcb115f good branch +HEAD is now at 2654535 zero /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -HEAD is now at 6aee0b5 good branch -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 6063df3ab195:f6b908606cad +HEAD is now at 2654535 zero +HEAD is now at 4b5aed7 good branch +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets e7af311e7ded:893e1f1c95a6 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +Cloning into './sub_hg_a/sub_hg_a_x'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into './sub_hg_a'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 9 Änderungssätze mit 9 Änderungen an 1 Dateien hinzu (+7 Köpfe) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + + d9ea018...6269137 branches/bad_branch -> branches/bad_branch (forced update) + dcb115f..f20a3db branches/good_branch -> branches/good_branch + + 408f3f4...bfbd2ed bad_bmark1 -> bad_bmark1 (forced update) + + 408f3f4...3eb2266 bad_bmark2 -> bad_bmark2 (forced update) + 408f3f4..36ce8a3 good_bmark -> good_bmark + 408f3f4..23bcbac master -> master + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + 408f3f4..23bcbac master -> master + 408f3f4..36ce8a3 good_bmark -> good_bmark + dcb115f..f20a3db branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + 408f3f4...bfbd2ed bad_bmark1 -> bad_bmark1 (forced update) + + 408f3f4...3eb2266 bad_bmark2 -> bad_bmark2 (forced update) + + d9ea018...6269137 branches/bad_branch -> branches/bad_branch (forced update) +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 64e792d05311 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_hg_b'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu (+1 Köpfe) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (+1 Köpfe) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...c15906a branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...d3788d0 branches/good_branch -> branches/good_branch (forced update) - + fffffff...411e2e9 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...03c81e5 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...c2f01ce good_bmark -> good_bmark (forced update) - + fffffff...2b4501a master -> master (forced update) + + fffffff...8eee14a branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...0350fa8 branches/good_branch -> branches/good_branch (forced update) + + fffffff...29e1a56 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...0caa096 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...c82852b good_bmark -> good_bmark (forced update) + + fffffff...8a5c1b1 master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...2b4501a master -> master (forced update) - + fffffff...c2f01ce good_bmark -> good_bmark (forced update) - + fffffff...d3788d0 branches/good_branch -> branches/good_branch (forced update) + + fffffff...8a5c1b1 master -> master (forced update) + + fffffff...c82852b good_bmark -> good_bmark (forced update) + + fffffff...0350fa8 branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...411e2e9 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...03c81e5 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...c15906a branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...29e1a56 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...0caa096 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...8eee14a branches/bad_branch -> branches/bad_branch (forced update) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 54414e0d833d:e197eff3324f +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets 487ba8c54f4c:024056aab59d progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into './sub_hg_a/sub_hg_a_x'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 8b06416cbf06 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... +Cloning into './sub_hg_b/sub_git'... +done. ok 23 - remote big push force expecting success: @@ -4247,15 +4500,20 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets d3ea9d4ca21a:92493d2c36ee -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets fe7de50487b7 +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + 4204c16..7ee93c1 master -> origin/master + 4204c16..7ee93c1 branches/default -> origin/branches/default +Updating 4204c16..7ee93c1 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ok 23 - remote big push force expecting success: @@ -4295,82 +4553,47 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets b2920d5441fb -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 4b5d83c..07cc4a6 master -> origin/master - 4b5d83c..07cc4a6 branches/default -> origin/branches/default -Updating 4b5d83c..07cc4a6 -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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 75486e894779 +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets cb8be24a1fcd progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - 424dfef..a3674df branches/default -> origin/branches/default - 424dfef..a3674df master -> origin/master -HEAD is now at 424dfef substate_hg_a -Updating 424dfef..a3674df + 90959b5..817d60a branches/default -> origin/branches/default + 90959b5..817d60a master -> origin/master +HEAD is now at 90959b5 substate_hg_a +Updating 90959b5..817d60a Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 5456491eb81d +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 8ad33dd8fafb progress revision 1 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 984a3ad..d9efbfe branches/default -> origin/branches/default - 984a3ad..d9efbfe master -> origin/master -HEAD is now at 984a3ad zero_sub_hg_a_x -Updating 984a3ad..d9efbfe + 81c3216..f4bcf23 branches/default -> origin/branches/default + 81c3216..f4bcf23 master -> origin/master +HEAD is now at 81c3216 zero_sub_hg_a_x +Updating 81c3216..f4bcf23 Fast-forward content_sub_hg_a_x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: 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 04df94dfdbef:b60e27c66fe1 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at 23e9940 zero -HEAD is now at 23e9940 zero -HEAD is now at ad6d034 good branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden ok 11 - subcommand sub subsequent recursive update -- merge expecting success: @@ -4378,15 +4601,51 @@ test_sub_foreach +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found +Cloning into 'gitrepo'... +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens bad_bmark1 +Hinzufügen des entfernten Lesezeichens bad_bmark2 +Hinzufügen des entfernten Lesezeichens good_bmark +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu +new changesets fadf78c94f71:1c4c1a6c2c5f +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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 121c662 zero +HEAD is now at 121c662 zero +HEAD is now at eb87d73 good branch +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens bad_bmark1 +Hinzufügen des entfernten Lesezeichens bad_bmark2 +Hinzufügen des entfernten Lesezeichens good_bmark +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu +new changesets fadf78c94f71:82b618b66fe0 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 121c662 zero +HEAD is now at 121c662 zero +HEAD is now at 27881ea good branch +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Keine Änderungen gefunden To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - ad6d034..ebed837 branches/good_branch -> branches/good_branch - 3444537..d8e9323 good_bmark -> good_bmark - 3444537..6614ba4 master -> master + eb87d73..c144fdc branches/good_branch -> branches/good_branch + 1856942..5c7328b good_bmark -> good_bmark + 1856942..96c4a9d 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) @@ -4397,54 +4656,21 @@ 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. - 3444537..6614ba4 master -> master - 3444537..d8e9323 good_bmark -> good_bmark - ad6d034..ebed837 branches/good_branch -> branches/good_branch + 1856942..96c4a9d master -> master + 1856942..5c7328b good_bmark -> good_bmark + eb87d73..c144fdc branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - ad6d034..ebed837 branches/good_branch -> branches/good_branch - 3444537..d8e9323 good_bmark -> good_bmark - 3444537..6614ba4 master -> master - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - 3444537..6614ba4 master -> master - 3444537..d8e9323 good_bmark -> good_bmark - ad6d034..ebed837 branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets 7bd85b14feb7:3be49c81af45 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at 8dc2d01 zero -HEAD is now at 8dc2d01 zero -HEAD is now at d6c5a5c good branch -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..872b00b branches/good_branch -> branches/good_branch - fffffff..17d0fdc good_bmark -> good_bmark - fffffff..73c2c3e master -> master + fffffff..2eba0d5 branches/good_branch -> branches/good_branch + fffffff..4b75d1c good_bmark -> good_bmark + fffffff..35be505 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) @@ -4455,28 +4681,50 @@ 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..73c2c3e master -> master - fffffff..17d0fdc good_bmark -> good_bmark - fffffff..872b00b branches/good_branch -> branches/good_branch + fffffff..35be505 master -> master + fffffff..4b75d1c good_bmark -> good_bmark + fffffff..2eba0d5 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: 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 +Keine Änderungen gefunden +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + eb87d73..c144fdc branches/good_branch -> branches/good_branch + 1856942..5c7328b good_bmark -> good_bmark + 1856942..96c4a9d master -> master + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + 1856942..96c4a9d master -> master + 1856942..5c7328b good_bmark -> good_bmark + eb87d73..c144fdc branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..872b00b branches/good_branch -> branches/good_branch - fffffff..17d0fdc good_bmark -> good_bmark - fffffff..73c2c3e master -> master + fffffff..2eba0d5 branches/good_branch -> branches/good_branch + fffffff..4b75d1c good_bmark -> good_bmark + fffffff..35be505 master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - fffffff..73c2c3e master -> master - fffffff..17d0fdc good_bmark -> good_bmark - fffffff..872b00b branches/good_branch -> branches/good_branch + fffffff..35be505 master -> master + fffffff..4b75d1c good_bmark -> good_bmark + fffffff..2eba0d5 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +Cloning into 'gitrepo'... ok 24 - remote big push dry-run expecting success: @@ -4522,11 +4770,8 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 24 - remote big push dry-run expecting success: @@ -4572,14 +4817,11 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 179dd3549a71:146c0f89e04a +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets ebf42b8d77ed:0eade0cf9ac0 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -4589,84 +4831,61 @@ Cloning into './sub_hg_a'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 8692a90ed16a:e821456984d9 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets c54ec7757c08:68ca61bb45e0 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into './sub_hg_a/sub_hg_a_x'... -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -added 1 changesets with 1 changes to 1 files -new changesets 4ec13b1cdeb1 -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 422884f2bee1 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/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 6d1ee74ac81e:817015dc722b -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) Cloning into './sub_hg_b'... -HEAD is now at 77e07ea zero -HEAD is now at 77e07ea zero -HEAD is now at 2b14237 good branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 4fb6b4871940:1e612db54f02 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets d41b80395e3c:29f44e84730b progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into './sub_hg_b/sub_git'... done. +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + a75bb45...c640163 branches/bad_branch -> branches/bad_branch (forced update) - 2b14237..538d155 branches/good_branch -> branches/good_branch - + 5540cb7...6ea947c bad_bmark1 -> bad_bmark1 (forced update) - + 5540cb7...32bb94f bad_bmark2 -> bad_bmark2 (forced update) - 5540cb7..351b797 good_bmark -> good_bmark - 5540cb7..73a10ff master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - 5540cb7..73a10ff master -> master - 5540cb7..351b797 good_bmark -> good_bmark - 2b14237..538d155 branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + 5540cb7...6ea947c bad_bmark1 -> bad_bmark1 (forced update) - + 5540cb7...32bb94f bad_bmark2 -> bad_bmark2 (forced update) - + a75bb45...c640163 branches/bad_branch -> branches/bad_branch (forced update) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens bad_bmark1 +Hinzufügen des entfernten Lesezeichens bad_bmark2 +Hinzufügen des entfernten Lesezeichens good_bmark +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu +new changesets 385702316ec6:33f49d6930c1 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into 'gitrepo'... -hg 0e3cf47e127899a51d4bd06e1497204789eb2cf3 e821456984d99135f856be7f59f9bad8b7dccb34 sub_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo -hg b147c08748842dadab3766a3c2a47829036136ae 4ec13b1cdeb10cb55cb5718a09d02c34194ccf35 sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a -hg 1d360a1c4ee58412d207a991e91fc4ab67573644 1e612db54f02f4b05e4965fbdf0381085768509f sub_hg_b /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg a32445d4445b1dfcdde28e9d4f5b8758938c2215 68ca61bb45e0a74e8a626c07dcff3eff01bb2c04 sub_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg ec40388d3508c67e3b52d5474b17f342d9b9aab1 422884f2bee1567792fe45e083f8059ada839484 sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a +hg 26a4afb498efcfe4c98554e045d15b05b18bb3b2 29f44e84730b46ad03b43422c3922504d2f2c313 sub_hg_b /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo git e9a16bb7c08361f85ab0002e4094b4229fefb384 e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_b ok 12 - subcommand sub foreach @@ -4700,42 +4919,75 @@ test_cmp expected actual ) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -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 2891719bcce9:6e2aca9c8827 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens bad_bmark1 +Hinzufügen des entfernten Lesezeichens bad_bmark2 +Hinzufügen des entfernten Lesezeichens good_bmark +Fügte 4 Änderungssätze mit 4 Änderungen an 1 Dateien hinzu +new changesets 385702316ec6:61794d6a8b4d +HEAD is now at 4f03547 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 8f6b127 zero -HEAD is now at 8f6b127 zero -HEAD is now at 79ef1cf good branch +HEAD is now at 4f03547 zero +HEAD is now at 3aa9123 good branch +HEAD is now at 4f03547 zero +HEAD is now at 4f03547 zero +HEAD is now at 3295c15 good branch +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Keine Änderungen gefunden +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + + 02d9d65...cd726c1 branches/bad_branch -> branches/bad_branch (forced update) + 3aa9123..d168b86 branches/good_branch -> branches/good_branch + + 7a5623a...d7fc924 bad_bmark1 -> bad_bmark1 (forced update) + + 7a5623a...60fcc72 bad_bmark2 -> bad_bmark2 (forced update) + 7a5623a..cb174b3 good_bmark -> good_bmark + 7a5623a..8e607f8 master -> master + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + 7a5623a..8e607f8 master -> master + 7a5623a..cb174b3 good_bmark -> good_bmark + 3aa9123..d168b86 branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + 7a5623a...d7fc924 bad_bmark1 -> bad_bmark1 (forced update) + + 7a5623a...60fcc72 bad_bmark2 -> bad_bmark2 (forced update) + + 02d9d65...cd726c1 branches/bad_branch -> branches/bad_branch (forced update) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...750b759 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...b238a9f branches/good_branch -> branches/good_branch (forced update) - + fffffff...304d11b bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...8ded6cf bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...6a60904 good_bmark -> good_bmark (forced update) - + fffffff...2f7425a master -> master (forced update) + + fffffff...84db0ae branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...e0006be branches/good_branch -> branches/good_branch (forced update) + + fffffff...d7fc924 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...60fcc72 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...cb174b3 good_bmark -> good_bmark (forced update) + + fffffff...8e607f8 master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...2f7425a master -> master (forced update) - + fffffff...6a60904 good_bmark -> good_bmark (forced update) - + fffffff...b238a9f branches/good_branch -> branches/good_branch (forced update) + + fffffff...8e607f8 master -> master (forced update) + + fffffff...cb174b3 good_bmark -> good_bmark (forced update) + + fffffff...e0006be branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...304d11b bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...8ded6cf bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...750b759 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...d7fc924 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...60fcc72 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...84db0ae branches/bad_branch -> branches/bad_branch (forced update) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets d8f9a87c54b4:8b8b3434bb3b +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 25 - remote big push force dry-run expecting success: @@ -4761,67 +5013,51 @@ test_expect_code 1 git push ) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 1e90135bffc8:9886aa261a84 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp Cloning into './sub_hg'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - 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 ac299c289a27:721da5384ac8 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -HEAD is now at 1b3b10f zero -[master 489d861] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +ok 25 - remote big push force dry-run + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero && + echo one > content && + hg commit -m one + ) && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git reset --hard HEAD^ && + echo two > content && + git commit -a -m two && + test_expect_code 1 git push && + test_expect_code 1 git push + ) + /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 960ddc9bbb6b +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 53384f0c4f4a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways url = foobar -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' -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. +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways ok 13 - subcommand sub sync expecting success: @@ -4886,35 +5122,65 @@ check_branch hgclone/sub_hg default one_sub_hg && check hgclone/sub_git HEAD one_sub_git -no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets 17fcc33f4edd:2d94122a9bf8 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +HEAD is now at 359c526 zero +[master f8efa75] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets ddb9bd3a2806:606507fcd6bc +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +HEAD is now at da785dc zero +[master 51cedb5] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Keine Änderungen gefunden +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Keine Änderungen gefunden +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: 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 +Keine Änderungen gefunden To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' -ok 25 - remote big push force dry-run - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero && - echo one > content && - hg commit -m one - ) && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git reset --hard HEAD^ && - echo two > content && - git commit -a -m two && - test_expect_code 1 git push && - test_expect_code 1 git push - ) - 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. @@ -4950,54 +5216,9 @@ ! grep feature-a out ) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets eeeb599c661e:4093f47810c8 -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -[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 0c981d2 zero -[master ce38163] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. -adding changesets -adding manifests -adding file changes -adding remote bookmark feature-a -added 2 changesets with 2 changes to 1 files -new changesets eeeb599c661e:936093d3b466 -Cloning into 'gitrepo'... -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Keine Änderungen gefunden To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' @@ -5036,21 +5257,72 @@ ! grep feature-a out ) -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets f53dc276cdef:062b51dcfb4f +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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'... +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets 50f5359eb6dc:5526ec20437c progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: 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 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens feature-a +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets 2bdf5a9c7b33:baf8fadaf68c +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Cloning into './sub_hg'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens feature-a +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets 2bdf5a9c7b33:baf8fadaf68c +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 94504230543a +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Cloning into './sub_git'... +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +done. +Keine Änderungen gefunden error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - [deleted] (none) -> origin/feature-a +[detached HEAD 919eafd] one_sub_hg + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) ok 27 - fetch prune expecting success: @@ -5095,102 +5367,15 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into './sub_hg'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets de29a0d5d37e -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_git'... -done. -[detached HEAD 8841b5a] one_sub_hg - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -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 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - fffffff..8841b5a HEAD -> master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark feature-a -no changes found -added 2 changesets with 2 changes to 1 files -1 local changesets published -new changesets 55bc3c5d8401:9865d6fab3bd -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - d518a95..8841b5a branches/default -> origin/branches/default -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -created new head -To /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git - * [new branch] HEAD -> new -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/gitrepo/ -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: 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 c9e8d9826a8826b35818d57ae4186fc72eaf473c [git 8841b5a] -Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] -no changes found +Keine Änderungen gefunden error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' -diff --git a/.hgsubstate b/.hgsubstate -index a9aacf4..d3d64fa 100644 ---- a/.hgsubstate -+++ b/.hgsubstate -@@ -1,2 +1,2 @@ --e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git --de29a0d5d37e980deecbdf7a16d0e2d54edac07c sub_hg -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git -+c9e8d9826a8826b35818d57ae4186fc72eaf473c sub_hg -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files (+1 heads) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - [deleted] (none) -> origin/feature-a - M .hgsubstate -new changesets 4e2d83789af8:abf6b8c1e053 -[master d119ed0] update_sub - Author: A U Thor - 1 file changed, 2 insertions(+), 2 deletions(-) -WARNING: Branch 'default' has more than one head, consider merging -WARNING: Branch 'default' has more than one head, consider merging -progress revision 1 'default' (0/1) -From hg::../hgrepo - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] branches/default -> origin/branches/default - * [new branch] master -> origin/master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Keine Änderungen gefunden ok 27 - fetch prune expecting success: @@ -5235,70 +5420,125 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg + fffffff..919eafd HEAD -> master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +0 Dateien aktualisiert, 0 Dateien zusammengeführt, 1 Dateien entfernt, 0 Dateien ungelöst +Keine Änderungen gefunden +1 local changesets published +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg + 5c64059..919eafd branches/default -> origin/branches/default +[detached HEAD cea1af1] one_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +To /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git + * [new branch] HEAD -> new +0 Dateien aktualisiert, 0 Dateien zusammengeführt, 1 Dateien entfernt, 0 Dateien ungelöst +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Updating ./sub_hg to 89e61c12e9fbecfa9a665ebf273e36732b5441d0 [git 919eafd] +Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] +diff --git a/.hgsubstate b/.hgsubstate +index 687b56a..7d298d6 100644 +--- a/.hgsubstate ++++ b/.hgsubstate +@@ -1,2 +1,2 @@ +-e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git +-94504230543a5ada8623cf5605f8e8feffe9b0b6 sub_hg ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git ++89e61c12e9fbecfa9a665ebf273e36732b5441d0 sub_hg + M .hgsubstate +[master f5db356] update_sub + Author: A U Thor + 1 file changed, 2 insertions(+), 2 deletions(-) +neuer Kopf erzeugt +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/gitrepo/ +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +neuer Kopf erzeugt +Keine Änderungen gefunden +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/gitrepo/ +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Änderungssätze hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu (+1 Köpfe) +new changesets f86eb2d029a8:5c5edb549f7c To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - fffffff..d119ed0 master -> master + fffffff..f5db356 master -> master +WARNING: Branch 'default' has more than one head, consider merging +WARNING: Branch 'default' has more than one head, consider merging +progress revision 1 'default' (0/1) +From hg::../hgrepo + * [new branch] branches/default -> branches/default + * [new branch] master -> master + * [new branch] branches/default -> origin/branches/default + * [new branch] master -> origin/master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu (+1 Köpfe) +new changesets a1a6c1b75a0b:5c5edb549f7c +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) Cloning into '/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgclone/sub_git'... done. +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 Switched to a new branch 'new' +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 1 Dateien entfernt, 0 Dateien ungelöst +Aktualisiere auf Zweig default +Klone Unterarchiv sub_git von /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git +Klone Unterarchiv sub_hg von /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg +3 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 1 Dateien entfernt, 0 Dateien ungelöst +0 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets d1c9208b10b3 +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets f4b1dd73d215 WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'branches/default' (2/2) progress revision 0 'default' (0/2) -updating to branch default -cloning subrepo sub_git from /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git -cloning subrepo sub_hg from /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg -3 files updated, 0 files merged, 0 files removed, 0 files unresolved From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + e90dbd6...d43b507 branches/default -> origin/branches/default (forced update) - + e90dbd6...d43b507 master -> origin/master (forced update) -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -ok 28 - fetch multiple independent histories - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo a > a && - hg add a && - hg commit -m a && - hg bookmark -r null bookmark - ) && - - ( - git clone "hg::hgrepo" gitrepo && - check gitrepo HEAD a && - cd gitrepo && - git checkout --quiet -b bookmark && - git remote -v && - echo b > b && - git add b && - git commit -m b && - git push origin bookmark - ) - -created new head -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/gitrepo/ + + 34659fc...98ec1ba branches/default -> origin/branches/default (forced update) + + 34659fc...98ec1ba master -> origin/master (forced update) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets de506533b86c ok 14 - subcommand sub addstate expecting success: @@ -5343,60 +5583,12 @@ test_cmp output actual ) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets ab2b350737cf:f96db8a4ca2b -WARNING: Branch 'default' has more than one head, consider merging -WARNING: Branch 'default' has more than one head, consider merging -progress revision 1 'default' (0/1) -From hg::../hgrepo - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] branches/default -> origin/branches/default - * [new branch] master -> origin/master -1 files updated, 0 files merged, 1 files removed, 0 files unresolved -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -adding remote bookmark bookmark -added 1 changesets with 1 changes to 1 files -new changesets 81d3e1cea4d3 -WARNING: Ignoring invalid bookmark 'bookmark' -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets e6522bf99c2e -origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (fetch) -origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (push) WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'branches/default' (2/2) progress revision 0 'default' (0/2) -[bookmark 5057a3f] b - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 b From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + f5ae7df...8df46c6 branches/default -> origin/branches/default (forced update) - + f5ae7df...8df46c6 master -> origin/master (forced update) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways + + 34659fc...d62c53c branches/default -> origin/branches/default (forced update) + + 34659fc...d62c53c master -> origin/master (forced update) ok 28 - fetch multiple independent histories expecting success: @@ -5423,85 +5615,95 @@ git push origin bookmark ) -no changes found -WARNING: Ignoring invalid bookmark 'bookmark' -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new branch] bookmark -> bookmark -ok 29 - clone remote with null bookmark, then push +ok 28 - fetch multiple independent histories expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && + test_when_finished "rm -rf gitrepo* hgrepo*" && ( hg init hgrepo && cd hgrepo && - echo one > content && - hg add content && - hg commit -m one && - echo two > content && - hg commit -m two + echo a > a && + hg add a && + hg commit -m a && + hg bookmark -r null bookmark ) && + ( 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 + 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 + ) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark bookmark /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -added 1 changesets with 1 changes to 1 files -new changesets 32e40c3ca109 WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens bookmark +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets dff004f6b173 WARNING: Ignoring invalid bookmark 'bookmark' 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 ffd93d486789:b3c3c8c91cdc -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens bookmark +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets dff004f6b173 +origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (fetch) +origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (push) +WARNING: Ignoring invalid bookmark 'bookmark' +[bookmark ef50060] b + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 b +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (fetch) origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (push) -[bookmark 928839a] b +[bookmark ef50060] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 355963c2585f:678c55783982 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Keine Änderungen gefunden /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -ok 30 - notes +WARNING: Ignoring invalid bookmark 'bookmark' +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new branch] bookmark -> bookmark +Keine Änderungen gefunden +WARNING: Ignoring invalid bookmark 'bookmark' +ok 29 - clone remote with null bookmark, then push -checking known breakage: +expecting success: test_when_finished "rm -rf hgrepo gitrepo" && ( @@ -5509,29 +5711,21 @@ 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 -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 +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo * [new branch] bookmark -> bookmark ok 29 - clone remote with null bookmark, then push @@ -5554,77 +5748,57 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 0de84e0a2aa6 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 570c549d3332 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 3 Änderungen an 3 Dateien hinzu +new changesets 0547c0f2f418:47583d04a7d8 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... Cloning into 'gitrepo'... -[master c3f1d8e] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into './sub_git'... -done. +Cloning into './sub_hg_a'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 80c747fdf281:2c5454722ab1 WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets b8b366cbad05:c702a6b4df5a +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - d28ab80..c3f1d8e master -> master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets b8b366cbad05:c702a6b4df5a +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets b4e96c4b503c +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 30 - notes -expecting success: +checking known breakage: test_when_finished "rm -rf hgrepo gitrepo" && ( @@ -5648,14 +5822,7 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual ---- expected 2024-04-20 23:16:00.790061099 +0000 -+++ actual 2024-04-20 23:16:00.878058030 +0000 -@@ -1,4 +1,3 @@ --4fbc951b54ad0ceab21e355dd9622862afa6d0a2 - - 570c549d333290923260b9c14a4080639341b148 - -not ok 31 - push updates notes # TODO known breakage +ok 30 - notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -5674,81 +5841,103 @@ 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 - f641acf1ea20a8f12806eeb76d67d50e638f21d8 ./sub_hg_a (heads/master) --2a957e9136428fee9a2c683a87db60f445bf776e[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) - f641acf1ea20a8f12806eeb76d67d50e638f21d8 ./sub_hg_a (heads/master) --2a957e9136428fee9a2c683a87db60f445bf776e[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) -ok 15 - subcommand sub status - -# passed all 15 test(s) -1..15 +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.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp Cloning into 'gitrepo'... Cloning into 'gitrepo'... + 04c9d4b4b549cc3a57bdc233b246f53fe759a936 ./sub_hg_a (heads/master) +-31dc0cf6cc89e2e51e2dd80b8ff8c5937543e774[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) + 04c9d4b4b549cc3a57bdc233b246f53fe759a936 ./sub_hg_a (heads/master) +-31dc0cf6cc89e2e51e2dd80b8ff8c5937543e774[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets d03a454ab4cc -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -[master fa7c476] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets d03a454ab4cc +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 19391213e2a1 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Dateiänderungen hinzu progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master fa7c476] two +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 19391213e2a1 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) +[master 175194e] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +ok 15 - subcommand sub status + +# passed all 15 test(s) +1..15 +[master 175194e] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..fa7c476 master -> master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +Keine Änderungen gefunden +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Suche nach Änderungen +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 48953bf..fa7c476 master -> master -ok 31 - push updates notes + f3bd8cc..175194e master -> master +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..175194e master -> master +--- expected 2025-05-24 05:42:53.445167619 +0000 ++++ actual 2025-05-24 05:42:53.477167619 +0000 +@@ -1,4 +1,3 @@ +-80405da14edfb328cbaf5076bf4fdc42cdea29e9 + + 19391213e2a19448f90add625805541003e8f0ea + +not ok 31 - push updates notes # TODO known breakage expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -5774,16 +5963,7 @@ check_bookmark hgrepo feature-a two -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -1 local changesets published -searching for changes -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new branch] feature-a -> feature-a -ok 32 - push bookmark without changesets +ok 31 - push updates notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -5798,63 +5978,105 @@ 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 Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 6a6602778d46 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 46906ceaa2b1 +progress revision walk 'bookmarks/master' (0/0) +Füge Änderungssätze hinzu +progress revision 0 'master' (0/1) +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 46906ceaa2b1 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 7fe78ef] two +[master c8fbe0a] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[master c8fbe0a] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -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 -new changesets a0a23bea0007 -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..7fe78ef master -> master -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -1 local changesets published -searching for changes +Keine Änderungen gefunden +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 85feec7..c8fbe0a master -> master +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new branch] feature-a -> feature-a + fffffff..c8fbe0a master -> master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -searching for changes -adding changesets -adding manifests -adding file changes +Keine Änderungen gefunden +Keine Änderungen gefunden +1 local changesets published +1 local changesets published +Suche nach Änderungen +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new branch] feature-a -> feature-a +Suche nach Änderungen +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new branch] feature-a -> feature-a +ok 32 - push bookmark without changesets + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + hg init hgrepo && + cd hgrepo && + echo one > content && + hg add content && + hg commit -m one + ) && + + git clone "hg::hgrepo" gitrepo && + + (cd hgrepo && hg tag v1.0) && + (cd gitrepo && git pull) && + + echo "v1.0" > expected && + git --git-dir=gitrepo/.git tag > actual && + test_cmp expected actual + ok 32 - push bookmark without changesets expecting success: @@ -5877,18 +6099,66 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual -added 1 changesets with 1 changes to 1 files -new changesets 7a1961d54440 +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 49c1d24bec0e +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 49c1d24bec0e +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.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Suche nach Änderungen +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 3acb44134584 +new changesets 3acb44134584 +progress revision 1 'default' (0/1) progress revision 1 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 2c001fc..3775fcb master -> origin/master - 2c001fc..3775fcb branches/default -> origin/branches/default + a346ac2..b732dd4 master -> origin/master + a346ac2..b732dd4 branches/default -> origin/branches/default + * [new tag] v1.0 -> v1.0 +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + a346ac2..b732dd4 master -> origin/master + a346ac2..b732dd4 branches/default -> origin/branches/default * [new tag] v1.0 -> v1.0 -Updating 2c001fc..3775fcb +Updating a346ac2..b732dd4 +Fast-forward +Updating a346ac2..b732dd4 Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) create mode 100644 .hgtags + .hgtags | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 .hgtags ok 33 - pull tags expecting success: @@ -5924,38 +6194,6 @@ hg -R hgrepo log --template "{desc}\n" > 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.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 40a9f20b1782 -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 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 6b9b6a98e286 -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 08084ef..af94d3e master -> origin/master - 08084ef..af94d3e branches/default -> origin/branches/default - * [new tag] v1.0 -> v1.0 -Cloning into 'gitrepo'... -Updating 08084ef..af94d3e -Fast-forward - .hgtags | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 .hgtags ok 33 - pull tags expecting success: @@ -5991,15 +6229,33 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual +Arbeitsverzeichnis wurde als Zweig feature markiert +(branches are permanent and global, did you want a bookmark?) +Arbeitsverzeichnis wurde als Zweig feature markiert +(branches are permanent and global, did you want a bookmark?) +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 40a9f20b1782:38a3aeb7c409 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 3 Änderungssätze mit 3 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 8068e2c99e9a:c2a57f862499 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'feature' (0/1) +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 3 Änderungssätze mit 3 Änderungen an 1 Dateien hinzu (+1 Köpfe) +new changesets 8068e2c99e9a:c2a57f862499 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) @@ -6007,20 +6263,34 @@ Merge made by the 'ort' strategy. content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +Auto-merging content +Merge made by the 'ort' strategy. + content | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) -added 1 changesets with 1 changes to 1 files (-1 heads) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Keine Änderungen gefunden +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (-1 Köpfe) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - ad564d7..e95deaf master -> master + 3eb9b80..ffc8d90 master -> master +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu (-1 Köpfe) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..ffc8d90 master -> master +ok 34 - push merged named branch + ok 34 - push merged named branch expecting success: @@ -6045,58 +6315,6 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual -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.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets aa1a7957b18b:7834d85002c3 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'feature' (0/1) -Auto-merging content -Merge made by the 'ort' strategy. - content | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 35371375910f -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (-1 heads) -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..4d757b2 master -> master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -ok 34 - push merged named branch - expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6119,7 +6337,53 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Füge Änderungssätze hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 447b30171698 +new changesets 447b30171698 +progress revision walk 'bookmarks/master' (0/0) +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Keine Änderungen gefunden +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Suche nach Änderungen +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new tag] v1.0 -> v1.0 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new tag] v1.0 -> v1.0 ok 35 - light tag sets author +ok 35 - light tag sets author + expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6148,43 +6412,6 @@ hg -R hgrepo log --template="{branch}\n" -r tip > actual && test_cmp expected actual -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 8674ca3c2eb6 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 8674ca3c2eb6:7baf8d21f3cc -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'feature' (0/1) -ok 35 - light tag sets author - expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6212,21 +6439,64 @@ hg -R hgrepo log --template="{branch}\n" -r tip > actual && test_cmp expected actual +Arbeitsverzeichnis wurde als Zweig feature markiert +(branches are permanent and global, did you want a bookmark?) +Arbeitsverzeichnis wurde als Zweig feature markiert +(branches are permanent and global, did you want a bookmark?) +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Füge Änderungssätze hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets f6266c482030:aa595581302c +Fügte 2 Änderungssätze mit 2 Änderungen an 1 Dateien hinzu +new changesets f6266c482030:aa595581302c +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision walk 'bookmarks/master' (0/0) +progress revision 1 'feature' (0/1) +progress revision 0 'master' (0/1) +progress revision 1 'feature' (0/1) +* master * master Switched to a new branch 'branches/feature' branch 'branches/feature' set up to track 'origin/branches/feature'. +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.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +Keine Änderungen gefunden +Keine Änderungen gefunden +Suche nach Änderungen +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Änderungssätze hinzu +Füge Dateiänderungen hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new tag] v1.0 -> v1.0 +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new tag] v1.0 -> v1.0 +ok 36 - push tag different branch + ok 36 - push tag different branch expecting success: @@ -6247,46 +6517,6 @@ git clone "hg::hgrepo" gitrepo && check_files 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.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 1061d8d3cd03:202206c1b33d -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'feature' (0/1) -* 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.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 2 changesets with 1 changes to 1 files -new changesets 57c794069bb2:7efbf8fce4f3 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -ok 36 - push tag different branch - expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6305,6 +6535,28 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets f38a7f9558ed:bd74d9556a66 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets f38a7f9558ed:bd74d9556a66 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 37 - cloning a removed file works expecting success: @@ -6328,17 +6580,6 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file/test_file" -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 1 changes to 1 files -new changesets 9a9cfd9ab1c0:caef73a75616 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) ok 37 - cloning a removed file works expecting success: @@ -6362,15 +6603,26 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file/test_file" +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -new changesets 9a92382a15f1:c032828fa827 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu +new changesets 27785c1ce0fd:6cb39bae77c0 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu +new changesets 27785c1ce0fd:6cb39bae77c0 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 38 - cloning a file replaced with a directory @@ -6398,16 +6650,6 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file" -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -new changesets 786ba9f864bb:ff483e61511e -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) ok 38 - cloning a file replaced with a directory expecting success: @@ -6434,16 +6676,26 @@ check_files gitrepo "dir_or_file" Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -new changesets 0c137253e386:ebdaff8fb3c0 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu +new changesets 070b0b8f04d8:a60825c62d36 +new changesets 070b0b8f04d8:a60825c62d36 progress revision walk 'bookmarks/master' (1/1) +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) progress revision 0 'master' (0/2) ok 39 - clone replace directory with a file @@ -6468,19 +6720,6 @@ 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.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -new changesets fb7bc1039cbb:4ec6f4c95e97 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) ok 39 - clone replace directory with a file expecting success: @@ -6504,16 +6743,34 @@ git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && check_files gitrepo "test.txt" +Arbeitsverzeichnis wurde als Zweig parent markiert +(branches are permanent and global, did you want a bookmark?) +Arbeitsverzeichnis wurde als Zweig parent markiert +(branches are permanent and global, did you want a bookmark?) +Arbeitsverzeichnis wurde als Zweig parent/child markiert +Arbeitsverzeichnis wurde als Zweig parent/child markiert +Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files -new changesets e0b8d5e7d1ed:54a027a987a5 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 3 Änderungssätze mit 3 Änderungen an 1 Dateien hinzu +new changesets 7cacb4f74407:397b51f59300 +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) +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 3 Änderungssätze mit 3 Änderungen an 1 Dateien hinzu +new changesets 7cacb4f74407:397b51f59300 WARNING: Ignoring matched branch parent/child progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) @@ -6547,45 +6804,6 @@ test_cmp expected actual -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.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 93dd22faa0c7 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files -new changesets 4e78f1be27ea:0b571019c4d7 -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 40 - clone can ignore invalid refnames expecting success: @@ -6615,6 +6833,50 @@ test_cmp expected actual +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets e5a39cf92a08 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets e5a39cf92a08 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Keine Änderungen gefunden +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new tag] v1.0 -> v1.0 +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new tag] v1.0 -> v1.0 ok 41 - push annotated tag expecting success: @@ -6637,67 +6899,6 @@ git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && test_cmp expected actual -Cloning into 'gitrepo1'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -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'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new branch] master -> master -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 4be226c897c8 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into 'gitrepo2'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -adding changesets -adding manifests -searching for changes -adding file changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets e522f351d13b -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -ok 42 - timezone issues with negative offsets - -# still have 2 known breakage(s) -# passed all remaining 40 test(s) -1..42 ok 41 - push annotated tag expecting success: @@ -6721,33 +6922,75 @@ test_cmp expected actual Cloning into 'gitrepo1'... +Cloning into 'gitrepo1'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden +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 +Keine Änderungen gefunden 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 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new branch] master -> master +Keine Änderungen gefunden +Cloning into 'gitrepo2'... +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo * [new branch] master -> master Cloning into 'gitrepo2'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets e522f351d13b +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +ok 42 - timezone issues with negative offsets + +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu new changesets e522f351d13b +# still have 2 known breakage(s) +# failed 1 among remaining 40 test(s) +1..42 +make[2]: *** [Makefile:14: main.t] Error 1 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 42 - timezone issues with negative offsets @@ -6777,17 +7020,17 @@ Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark feature-a -added 1 changesets with 1 changes to 1 files -new changesets 43d59634493a +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Hinzufügen des entfernten Lesezeichens feature-a +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 86cf095ca710 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden error: refusing to update ref with bad name 'hg/origin/refs/heads/feature-a' ok 43 - remote delete bookmark @@ -6825,35 +7068,35 @@ Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 2dc0a79bbd1f +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 98965f3faf4a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 9c17a30] one +[master 564fa72] one Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. 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 +Keine Änderungen gefunden +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -adding remote bookmark feature-b +Keine Änderungen gefunden +Hinzufügen des entfernten Lesezeichens feature-b 1 local changesets published -searching for changes +Suche nach Änderungen /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -adding remote bookmark feature-a -searching for changes +Keine Änderungen gefunden +Hinzufügen des entfernten Lesezeichens feature-a +Suche nach Änderungen ok 44 - source:dest bookmark expecting success: @@ -6874,18 +7117,18 @@ Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets bfe88fbff53d +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets f2e44eeef14f progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Aktualisiere auf Zweig default +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden progress revision walk 'branches/default' (0/0) progress revision 0 'default' (0/1) From hg::../hgrepo.second @@ -6893,26 +7136,26 @@ * [new branch] master -> second/master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 2 files -new changesets 616936cf743a:e23f0676a81a +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 5 Änderungssätze mit 5 Änderungen an 2 Dateien hinzu +new changesets 498c83c079ef:44ceb457a5c5 progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 9f3b355..1d47ae8 master -> origin/master - 9f3b355..1d47ae8 branches/default -> origin/branches/default -HEAD is now at 1d47ae8 restored + 9a0433a..017f183 master -> origin/master + 9a0433a..017f183 branches/default -> origin/branches/default +HEAD is now at 017f183 restored /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:1613: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - ! [remote rejected] master -> master (rejected not pushing hg based commit f6972d1c46adb9ee57457bd4e9b4ad10322d31f9) + ! [remote rejected] master -> master (rejected not pushing hg based commit 57dc916b049da5d08869390199fe03f33453175a) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second' - ! [remote rejected] master -> master (rejected not pushing hg based commit f6972d1c46adb9ee57457bd4e9b4ad10322d31f9) + ! [remote rejected] master -> master (rejected not pushing hg based commit 57dc916b049da5d08869390199fe03f33453175a) ok 45 - check-hg-commits with fail mode expecting success: @@ -6923,8 +7166,8 @@ or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Aktualisiere auf Zweig default +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] progress revision walk 'branches/default' (0/0) @@ -6936,25 +7179,25 @@ or locale.getdefaultlocale()[1] progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - d5827a7..f3fdb58 master -> origin/master - d5827a7..f3fdb58 branches/default -> origin/branches/default -HEAD is now at f3fdb58 restored + f1840be..256b5a7 master -> origin/master + f1840be..256b5a7 branches/default -> origin/branches/default +HEAD is now at 256b5a7 restored /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:1613: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -WARNING: Pushing hg changeset fe02e2734100a41feb0b75ef83d65dabb758804c for 5a0a60649b229146bfe3d64c955425f929189623 -WARNING: Pushing hg changeset 957d67fc1e44a0326191fc3c01a1478c952d0c5e for 055a7fed075afdf7a1ed8842e5d96832ddf06be1 -WARNING: Pushing hg changeset 0c71700a949177d0bb4bbb7c18bcc3d21fb04354 for 3f25534333116a73a3e2353cc3f159e9b1494f8d -WARNING: Pushing hg changeset ff9f32626c6cc3d7b106ebeca76a1411d1f4c1ff for aee4adf327662e6cc480db0268ca5ca9b4d2229e -WARNING: Pushing hg changeset 88e8f4f127aed0a9fc76f885b5b1ddc1f7f4d125 for f3fdb5808036667c719f1e8e5959ba334ec2f175 +WARNING: Pushing hg changeset 162c9840d4de26802d38a34d377945b13f957290 for c91bff4da1e6ddce6cf521e91d4df860587fda7c +WARNING: Pushing hg changeset 7df5c052a6562badaa02e03397f1aca1d4196daf for 5ad35971a2a46bc7bf1cafad911ce54cb819169c +WARNING: Pushing hg changeset f0f25480a4979ff3ef3e387eb91165dddf820969 for a197a16d70dd05365ccbe2c24001475d61265957 +WARNING: Pushing hg changeset 1e741fed6c37216fbbd7d01d7720f8a3dfd4fbf6 for ec729232d901250c08b6a5412398236e5a5091b8 +WARNING: Pushing hg changeset 0d1c58e3d6a8b577341e48a1c5248c4bad786f25 for 256b5a7a21a5fbdc17117afd90c124f2aafccc0c To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..f3fdb58 master -> master -WARNING: Pushing hg changeset fe02e2734100a41feb0b75ef83d65dabb758804c for 5a0a60649b229146bfe3d64c955425f929189623 -WARNING: Pushing hg changeset 957d67fc1e44a0326191fc3c01a1478c952d0c5e for 055a7fed075afdf7a1ed8842e5d96832ddf06be1 -WARNING: Pushing hg changeset 0c71700a949177d0bb4bbb7c18bcc3d21fb04354 for 3f25534333116a73a3e2353cc3f159e9b1494f8d -WARNING: Pushing hg changeset ff9f32626c6cc3d7b106ebeca76a1411d1f4c1ff for aee4adf327662e6cc480db0268ca5ca9b4d2229e -WARNING: Pushing hg changeset 88e8f4f127aed0a9fc76f885b5b1ddc1f7f4d125 for f3fdb5808036667c719f1e8e5959ba334ec2f175 + fffffff..256b5a7 master -> master +WARNING: Pushing hg changeset 162c9840d4de26802d38a34d377945b13f957290 for c91bff4da1e6ddce6cf521e91d4df860587fda7c +WARNING: Pushing hg changeset 7df5c052a6562badaa02e03397f1aca1d4196daf for 5ad35971a2a46bc7bf1cafad911ce54cb819169c +WARNING: Pushing hg changeset f0f25480a4979ff3ef3e387eb91165dddf820969 for a197a16d70dd05365ccbe2c24001475d61265957 +WARNING: Pushing hg changeset 1e741fed6c37216fbbd7d01d7720f8a3dfd4fbf6 for ec729232d901250c08b6a5412398236e5a5091b8 +WARNING: Pushing hg changeset 0d1c58e3d6a8b577341e48a1c5248c4bad786f25 for 256b5a7a21a5fbdc17117afd90c124f2aafccc0c ok 46 - check-hg-commits with push mode - no local proxy expecting success: @@ -6963,18 +7206,18 @@ Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 98dd0a7890b4 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 32c5373e9f0d progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Aktualisiere auf Zweig default +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden progress revision walk 'branches/default' (0/0) progress revision 0 'default' (0/1) From hg::../hgrepo.second @@ -6982,39 +7225,39 @@ * [new branch] master -> second/master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 2 files -new changesets 5cb3e05f9a3d:e5cab7027a47 +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 5 Änderungssätze mit 5 Änderungen an 2 Dateien hinzu +new changesets 051b1d4f8f58:5a52e32a76f3 progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - a6ea577..a6bc108 master -> origin/master - a6ea577..a6bc108 branches/default -> origin/branches/default -HEAD is now at a6bc108 restored + bddb7ec..8bd5a97 master -> origin/master + bddb7ec..8bd5a97 branches/default -> origin/branches/default +HEAD is now at 8bd5a97 restored /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:1613: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -WARNING: Using hg changeset 5cb3e05f9a3d3d9e9127a7a329f3f0a1e952267c for 6c30fd6063b13dc6ce50e345e83ab94aad5944d2 -WARNING: Using hg changeset feee560ca7b556d54e788e045e392a8518001df7 for 32141c571546f76e2b1576b1a02ce2167785875c -WARNING: Using hg changeset 34fec1a3173c310e59766ba259d04a88c37730fe for b86d85c87381e8a4754e3c7b5f582901de62fa63 -WARNING: Using hg changeset 1202c595a109c96000f13cc6e7fb4f4cf2ad1100 for 5b336c151be0850eabee0c7873c28382f4345bdf -WARNING: Using hg changeset e5cab7027a470e659425c8d673ce6edeb6bcd187 for a6bc1087c96bc3fe7acf3d7ddbeafe8463756e11 -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 2 files +WARNING: Using hg changeset 051b1d4f8f5887af6bad07d477c5bd526609af5f for d380cce2283a63d7f8e39920095d554b1040a0fc +WARNING: Using hg changeset 8d8caf7b49fc00ac449842092be7b5817cb1ed73 for 798bd5af688bc8a751ba4ced55874d34eba96eda +WARNING: Using hg changeset e9c77b9d3aa7f8783c4a7dca00df762e37ab7b6e for 5105d2b0e9c4d2eb202f449f15de9639d6235a79 +WARNING: Using hg changeset b2c14f1a2392cb0a50c49de898c74a214b22229a for 6e65c5a7f2cd8704de95a4cd95be915dc961b939 +WARNING: Using hg changeset 5a52e32a76f31896b421c4a5d96179b54a45be39 for 8bd5a979c2f9c51081dd0c3d872ee7f3235195fa +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 5 Änderungssätze mit 5 Änderungen an 2 Dateien hinzu To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..a6bc108 master -> master -WARNING: Using hg changeset 5cb3e05f9a3d3d9e9127a7a329f3f0a1e952267c for 6c30fd6063b13dc6ce50e345e83ab94aad5944d2 -WARNING: Using hg changeset feee560ca7b556d54e788e045e392a8518001df7 for 32141c571546f76e2b1576b1a02ce2167785875c -WARNING: Using hg changeset 34fec1a3173c310e59766ba259d04a88c37730fe for b86d85c87381e8a4754e3c7b5f582901de62fa63 -WARNING: Using hg changeset 1202c595a109c96000f13cc6e7fb4f4cf2ad1100 for 5b336c151be0850eabee0c7873c28382f4345bdf -WARNING: Using hg changeset e5cab7027a470e659425c8d673ce6edeb6bcd187 for a6bc1087c96bc3fe7acf3d7ddbeafe8463756e11 + fffffff..8bd5a97 master -> master +WARNING: Using hg changeset 051b1d4f8f5887af6bad07d477c5bd526609af5f for d380cce2283a63d7f8e39920095d554b1040a0fc +WARNING: Using hg changeset 8d8caf7b49fc00ac449842092be7b5817cb1ed73 for 798bd5af688bc8a751ba4ced55874d34eba96eda +WARNING: Using hg changeset e9c77b9d3aa7f8783c4a7dca00df762e37ab7b6e for 5105d2b0e9c4d2eb202f449f15de9639d6235a79 +WARNING: Using hg changeset b2c14f1a2392cb0a50c49de898c74a214b22229a for 6e65c5a7f2cd8704de95a4cd95be915dc961b939 +WARNING: Using hg changeset 5a52e32a76f31896b421c4a5d96179b54a45be39 for 8bd5a979c2f9c51081dd0c3d872ee7f3235195fa ok 47 - check-hg-commits with push mode - with local proxy expecting success: @@ -7032,37 +7275,37 @@ Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 8c484be347cb +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 22ce2f134cc4 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden From hg::../hgrepo * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Apr 20 23:17 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Apr 20 23:17 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 24 05:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 24 05:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Apr 20 23:17 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 24 05:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Apr 20 23:17 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 24 05:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 refs ok 48 - shared-marks unset expecting success: @@ -7090,37 +7333,37 @@ Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets db43825a3614 +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 226c5347d855 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden From hg::../hgrepo * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Apr 20 23:17 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Apr 20 23:17 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 24 05:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 24 05:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Apr 20 23:17 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 24 05:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Apr 20 23:17 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 24 05:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 refs /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: seeded marks of second with shared; performing gc @@ -7142,29 +7385,29 @@ Including notes commits ... Writing hg marks ... Writing git marks ... -no changes found +Keine Änderungen gefunden progress revision walk 'branches/default' (0/0) progress revision 0 'default' (0/1) total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Apr 20 23:17 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Apr 20 23:17 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Apr 20 23:17 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 24 05:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 24 05:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 24 05:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Apr 20 23:17 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Apr 20 23:17 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Apr 20 23:17 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 24 05:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 24 05:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 24 05:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 refs ok 49 - shared-marks set to unset expecting success: @@ -7201,86 +7444,86 @@ Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 59e29311afbb +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 1 Änderungen an 1 Dateien hinzu +new changesets 657209f4ac1a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden progress revision walk 'branches/default' (0/0) progress revision 0 'default' (0/1) From hg::../hgrepo * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Apr 20 23:17 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Apr 20 23:17 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Apr 20 23:17 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 24 05:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 24 05:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 24 05:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Apr 20 23:17 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Apr 20 23:17 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Apr 20 23:17 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 24 05:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 24 05:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 24 05:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 refs /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Apr 20 23:17 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Apr 20 23:17 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Apr 20 23:17 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 24 05:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 24 05:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 24 05:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Apr 20 23:17 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Apr 20 23:17 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Apr 20 23:17 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 24 05:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 24 05:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 24 05:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 refs /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: using marks of remote origin as shared marks -no changes found +Keine Änderungen gefunden total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Apr 20 23:17 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Apr 20 23:17 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 24 05:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 24 05:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Apr 20 23:17 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 24 05:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Apr 20 23:17 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Apr 20 23:17 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Apr 20 23:17 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 24 05:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 24 05:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 24 05:43 refs ok 50 - shared-marks unset to set expecting success: @@ -7320,18 +7563,18 @@ rename content => content2 (100%) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:1613: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 2 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu 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) +1 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst +Access: (0777/-rwxrwxrwx) Uid: ( 2222/pbuilder2) Gid: ( 2222/pbuilder2) ok 51 - push with renamed executable preserves executable bit expecting success: @@ -7378,90 +7621,40 @@ create mode 160000 sub /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found +Keine Änderungen gefunden /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:1613: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 2 changes to 2 files +Suche nach Änderungen +Füge Änderungssätze hinzu +Füge Manifeste hinzu +Füge Dateiänderungen hinzu +Fügte 1 Änderungssätze mit 2 Änderungen an 2 Dateien hinzu To hg::../hgrepo * [new branch] master -> master -2 files updated, 0 files merged, 0 files removed, 0 files unresolved +2 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst ok 52 - push with submodule -# passed all 52 test(s) +# failed 2 among 52 test(s) 1..52 -make clean -make[3]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds/test' -rm -f -r 'trash directory'.* test-results -make[3]: Leaving directory '/build/reproducible-path/git-remote-hg-1.0.4~ds/test' +make[2]: *** [Makefile:14: main-push.t] Error 1 make[2]: Leaving directory '/build/reproducible-path/git-remote-hg-1.0.4~ds/test' +make[1]: *** [Makefile:32: test] Error 2 make[1]: Leaving directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' - create-stamp debian/debhelper-build-stamp - dh_prep - debian/rules override_dh_auto_install -make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' -dh_auto_install -- prefix=/usr install-doc - make -j11 install DESTDIR=/build/reproducible-path/git-remote-hg-1.0.4\~ds/debian/git-remote-hg AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" prefix=/usr install-doc -make[2]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' -if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then \ - : Use chosen Python version ; \ -elif python3 -c 'import mercurial' 2> /dev/null ; then \ - PYTHON=python3 ; \ -elif python2 -c 'import mercurial' 2> /dev/null ; then \ - PYTHON=python2 ; \ -elif python -c 'import mercurial' 2> /dev/null ; then \ - PYTHON=python ; \ -else \ - echo 'Python with Mercurial not available' >&2 ; \ - exit 1 ; \ -fi ; \ -mkdir -p bin ; \ -for s in git-remote-hg git-hg-helper ; do \ - printf "%s\n" "#!/usr/bin/env $PYTHON" > "bin/$s" ; \ - tail -n +2 "./$s" >> "bin/$s" ; \ - chmod 755 "bin/$s" ; \ - touch -r "./$s" "bin/$s" ; \ -done -install -d -m 755 /build/reproducible-path/git-remote-hg-1.0.4~ds/debian/git-remote-hg/usr/share/man/man1/ -install -m 644 doc/git-remote-hg.1 /build/reproducible-path/git-remote-hg-1.0.4~ds/debian/git-remote-hg/usr/share/man/man1/git-remote-hg.1 -install -d -m 755 /build/reproducible-path/git-remote-hg-1.0.4~ds/debian/git-remote-hg/usr/bin/ -install -m 755 bin/git-remote-hg /build/reproducible-path/git-remote-hg-1.0.4~ds/debian/git-remote-hg/usr/bin/git-remote-hg -install -m 755 bin/git-hg-helper /build/reproducible-path/git-remote-hg-1.0.4~ds/debian/git-remote-hg/usr/bin/git-hg-helper -make[2]: Leaving directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' -make[1]: Leaving directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' - dh_installdocs - dh_installchangelogs - dh_installman - dh_python3 -I: dh_python3 tools:113: replacing shebang in debian/git-remote-hg/usr/bin/git-hg-helper -I: dh_python3 tools:113: replacing shebang in debian/git-remote-hg/usr/bin/git-remote-hg - dh_perl - dh_link - dh_strip_nondeterminism - dh_compress - dh_fixperms - dh_missing - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb -dpkg-deb: building package 'git-remote-hg' in '../git-remote-hg_1.0.4~ds-1_all.deb'. - dpkg-genbuildinfo --build=binary -O../git-remote-hg_1.0.4~ds-1_i386.buildinfo - dpkg-genchanges --build=binary -O../git-remote-hg_1.0.4~ds-1_i386.changes -dpkg-genchanges: info: binary-only upload (no source code included) - dpkg-source --after-build . -dpkg-buildpackage: info: binary-only upload (no source included) -dpkg-genchanges: info: including full source code in upload +dh_auto_test: error: make -j21 test returned exit code 2 +make: *** [debian/rules:11: binary] Error 25 +dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 I: copying local configuration +E: Failed autobuilding of package +I: user script /srv/workspace/pbuilder/80707/tmp/hooks/C01_cleanup starting +debug output: disk usage on i-capture-the-hostname at Sat May 24 05:43:52 UTC 2025 +Filesystem Size Used Avail Use% Mounted on +tmpfs 3.9G 0 3.9G 0% /dev/shm + +I: user script /srv/workspace/pbuilder/80707/tmp/hooks/C01_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/20952 and its subdirectories -I: Current time: Sat Apr 20 11:17:47 -12 2024 -I: pbuilder-time-stamp: 1713655067 +I: removing directory /srv/workspace/pbuilder/80707 and its subdirectories