Diff of the two buildlogs: -- --- b1/build.log 2023-04-14 03:45:21.885613519 +0000 +++ b2/build.log 2023-04-14 03:51:38.512888232 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Wed May 15 22:02:23 -12 2024 -I: pbuilder-time-stamp: 1715853743 +I: Current time: Fri Apr 14 17:45:24 +14 2023 +I: pbuilder-time-stamp: 1681443924 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/bookworm-reproducible-base.tgz] I: copying local configuration @@ -16,7 +16,7 @@ I: copying [./git-remote-hg_1.0.4~ds.orig.tar.xz] I: copying [./git-remote-hg_1.0.4~ds-1.debian.tar.xz] I: Extracting source -gpgv: Signature made Wed Dec 7 14:17:37 2022 -12 +gpgv: Signature made Thu Dec 8 16:17:37 2022 +14 gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 gpgv: Can't check signature: No public key dpkg-source: warning: cannot verify inline signature for ./git-remote-hg_1.0.4~ds-1.dsc: no acceptable signature found @@ -27,11 +27,20 @@ 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/30658/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/7780/tmp/hooks/D01_modify_environment starting +debug: Running on codethink12-arm64. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +lrwxrwxrwx 1 root root 4 Jan 6 03:20 /bin/sh -> dash +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/7780/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/7780/tmp/hooks/D02_print_environment starting I: set BUILDDIR='/build' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME='pbuilder2' BUILD_ARCH='arm64' DEBIAN_FRONTEND='noninteractive' DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=8' @@ -41,38 +50,38 @@ IFS=' ' LANG='C' - LANGUAGE='en_US:en' + LANGUAGE='nl_BE:nl' LC_ALL='C' MAIL='/var/mail/root' OPTIND='1' - PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' + 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' - PPID='30658' + PPID='7780' PS1='# ' PS2='> ' 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.hVBbyxZI/pbuilderrc_viaI --distribution bookworm --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.hVBbyxZI/b1 --logfile b1/build.log git-remote-hg_1.0.4~ds-1.dsc' + 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.hVBbyxZI/pbuilderrc_ySq7 --distribution bookworm --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.hVBbyxZI/b2 --logfile b2/build.log --extrapackages usrmerge git-remote-hg_1.0.4~ds-1.dsc' SUDO_GID='117' SUDO_UID='110' SUDO_USER='jenkins' TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' + TZ='/usr/share/zoneinfo/Etc/GMT-14' USER='root' USERNAME='root' _='/usr/bin/systemd-run' http_proxy='http://192.168.101.16:3128' I: uname -a - Linux codethink11-arm64 4.15.0-208-generic #220-Ubuntu SMP Mon Mar 20 14:28:12 UTC 2023 aarch64 GNU/Linux + Linux i-capture-the-hostname 4.15.0-208-generic #220-Ubuntu SMP Mon Mar 20 14:28:12 UTC 2023 aarch64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 May 15 05:13 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/30658/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Apr 13 00:25 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/7780/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -200,7 +209,7 @@ Get: 74 http://deb.debian.org/debian bookworm/main arm64 mercurial-git all 1.0.1-1 [62.1 kB] Get: 75 http://deb.debian.org/debian bookworm/main arm64 sharness all 1.0.0-1.1 [28.6 kB] Get: 76 http://deb.debian.org/debian bookworm/main arm64 xmlto arm64 0.0.28-2.1 [33.3 kB] -Fetched 40.3 MB in 1s (36.2 MB/s) +Fetched 40.3 MB in 1s (51.5 MB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libpython3.11-minimal:arm64. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 19616 files and directories currently installed.) @@ -528,8 +537,17 @@ Writing extended state information... Building tag database... -> Finished parsing the build-deps +Reading package lists... +Building dependency tree... +Reading state information... +usrmerge is already the newest version (35). +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. I: Building the package -I: Running cd /build/git-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/7780/tmp/hooks/A99_set_merged_usr starting +Re-configuring usrmerge... +I: user script /srv/workspace/pbuilder/7780/tmp/hooks/A99_set_merged_usr finished +hostname: Temporary failure in name resolution +I: Running cd /build/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 @@ -593,15 +611,6 @@ ) expecting success: - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - ) - -expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && setup_repos && @@ -614,6 +623,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*" && ( @@ -692,31 +710,31 @@ Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] adding changesets -adding changesets -adding manifests adding manifests adding file changes -adding file changes -added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files -new changesets 876989df894e -new changesets 876989df894e -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +new changesets 11a7eace1097 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) adding changesets adding manifests adding file changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 11a7eace1097 added 1 changesets with 1 changes to 1 files -new changesets 876989df894e +new changesets 11a7eace1097 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 2 - cloning @@ -751,6 +769,10 @@ /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +marked working directory as branch next +(branches are permanent and global, did you want a bookmark?) +marked working directory as branch next +(branches are permanent and global, did you want a bookmark?) adding changesets adding manifests adding file changes @@ -758,10 +780,6 @@ new changesets 1e3e49d2cc8f:6674f1c866b5 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) -marked working directory as branch next -(branches are permanent and global, did you want a bookmark?) -marked working directory as branch next -(branches are permanent and global, did you want a bookmark?) origin ok 1 - subcommand help @@ -784,37 +802,37 @@ Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -searching for changes -no changes found -searching for changes -adding changesets -adding manifests /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding file changes WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -added 4 changesets with 4 changes to 4 files -adding changesets -adding manifests -adding file changes adding changesets adding manifests adding file changes +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] added 2 changesets with 2 changes to 1 files -new changesets 876989df894e:33b747239ee3 -added 2 changesets with 2 changes to 1 files -new changesets 876989df894e:33b747239ee3 +new changesets 11a7eace1097:33be40a857f1 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +new changesets 11a7eace1097:33be40a857f1 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) +searching for changes +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 4 changes to 4 files ok 3 - cloning with branches expecting success: @@ -854,6 +872,10 @@ or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... ok 1 - encoding expecting success: @@ -909,10 +931,6 @@ Author: A U Thor 1 file changed, 1 deletion(-) delete mode 100644 foo/bar -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... ok 2 - subcommand repo - no local proxy expecting success: @@ -930,34 +948,30 @@ test_cmp expected actual +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 11a7eace1097:98141257328c +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'next' (0/1) adding changesets -new changesets 876989df894e:24a737c76377 adding manifests adding file changes adding remote bookmark feature-a -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 876989df894e:24a737c76377 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'next' (0/1) +new changesets 11a7eace1097:98141257328c 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 ok 4 - cloning with bookmarks expecting success: @@ -979,10 +993,6 @@ check_bookmark hgrepo devel devel -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files ok 4 - cloning with bookmarks expecting success: @@ -1004,79 +1014,87 @@ check_bookmark hgrepo devel devel +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 3 changes to 3 files Cloning into 'gitrepo'... Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] adding changesets adding manifests +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways adding file changes adding remote bookmark devel adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 876989df894e:24a737c76377 -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +new changesets 11a7eace1097:98141257328c progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) adding changesets -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] adding manifests adding file changes adding remote bookmark devel adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 876989df894e:24a737c76377 +new changesets 11a7eace1097:98141257328c progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +[devel 3241d4c] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes +[devel 3241d4c] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +added 1 changesets with 1 changes to 1 files +new changesets acec9cf87d3c +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 5 changesets with 3 changes to 3 files new changesets 362b656574c3:54f595cbdf1f -added 1 changesets with 1 changes to 1 files -new changesets 06f35605d066 -progress revision walk 'bookmarks/master' (0/0) progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/1) progress revision 0 'master' (0/5) -[devel def2614] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[devel def2614] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +no changes found /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] ok 3 - subcommand repo - with local proxy expecting success: @@ -1093,15 +1111,6 @@ test_cmp rev-HEAD git-HEAD ) -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files ok 5 - update bookmark expecting success: @@ -1119,6 +1128,8 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] ok 5 - update bookmark expecting success: @@ -1136,19 +1147,26 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +searching for changes +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 3 changes to 3 files /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] adding remote bookmark devel adding remote bookmark feature-a added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets 876989df894e:294c871dda28 +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +new changesets 11a7eace1097:c7311eb552e4 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) @@ -1158,38 +1176,44 @@ adding remote bookmark devel adding remote bookmark feature-a added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets 876989df894e:294c871dda28 +new changesets 11a7eace1097:c7311eb552e4 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -[feature-b 468ae07] feature-b +[feature-b 9f6751b] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... -[feature-b 468ae07] feature-b +[feature-b 9f6751b] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +no changes found +searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 974ad38945c4 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -no changes found -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 8a7c42fb7cd7 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 2 - file removal expecting success: @@ -1219,7 +1243,6 @@ test_cmp expected actual -no changes found [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) @@ -1228,13 +1251,6 @@ Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 beta -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] ok 6 - new bookmark expecting success: @@ -1299,6 +1315,8 @@ test_cmp expected actual +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] no changes found @@ -1307,10 +1325,10 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -searching for changes -searching for changes /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +searching for changes +searching for changes ok 4 - subcommands hg-rev and git-rev expecting success: @@ -1375,7 +1393,7 @@ adding manifests adding file changes added 4 changesets with 4 changes to 1 files -new changesets 939cc495fc47:820b97c27c25 +new changesets d220a77f11dc:a6a4bfa59905 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) ok 3 - git tags @@ -1417,7 +1435,7 @@ test_cmp expected actual 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/0a69c6ad841b-38771745-backup.hg +saved backup bundle to /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/a30f7f0b50a0-fb5c3c63-backup.hg /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] no changes found @@ -1434,16 +1452,18 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 977b371a0a1b +new changesets 47091326c362 progress revision 4 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - + 3655fe6...748e620 master -> origin/master (forced update) - + 3655fe6...748e620 branches/default -> origin/branches/default (forced update) -HEAD is now at 748e620 four -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] + + a571710...ee20ae5 master -> origin/master (forced update) + + a571710...ee20ae5 branches/default -> origin/branches/default (forced update) +HEAD is now at ee20ae5 four Cloning into 'gitrepo'... Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] Loading hg marks ... Loading git marks ... Performing garbage collection on git commits ... @@ -1483,24 +1503,22 @@ test_cmp expected actual -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 e73abf5f81f9:3db57573f78a +new changesets 4687a411d843:619da2d162ec +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) adding changesets adding manifests adding file changes added 12 changesets with 12 changes to 1 files -new changesets e73abf5f81f9:be691099f9b6 +new changesets 4687a411d843:0bd453123aa2 progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) ok 7 - authors @@ -1585,17 +1603,18 @@ Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 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 e1e42f3a2eea -searching for changes -adding changesets +new changesets 3f4e5f29fbbc progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... +searching for changes +adding changesets adding manifests adding file changes adding remote bookmark not-master @@ -1605,62 +1624,64 @@ progress revision 1 'default' (0/1) progress revision 2 'gamma' (0/1) Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 f9a94f68448e:11211ef1a777 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 43be1c8f31f9:e96b62f9b31e +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] searching for changes -no changes found -searching for changes +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 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 d4dfbbb965a4 +progress revision 1 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + 24b1e85..3c856b7 master -> origin/master + 24b1e85..3c856b7 branches/default -> origin/branches/default +searching for changes +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/11211ef1a777-891de6f3-backup.hg +no changes found +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 1 files -new changesets 3c43a31e7acc:16af4e92c65c searching for changes adding changesets adding manifests adding file changes -searching for changes added 1 changesets with 0 changes to 0 files -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -adding changesets -adding manifests -adding file changes searching for changes searching for changes -added 1 changesets with 1 changes to 1 files -new changesets 3d2a62fce3d3 -progress revision 1 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 4436134..c20fe6a master -> origin/master - 4436134..c20fe6a branches/default -> origin/branches/default -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 3c43a31e7acc:16af4e92c65c -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/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo/.hg/strip-backup/16af4e92c65c-dff044e2-backup.hg -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/16af4e92c65c-dff044e2-backup.hg +saved backup bundle to /build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo/.hg/strip-backup/e96b62f9b31e-d55d78b5-backup.hg 0 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +searching for changes ok 6 - subcommand [some-repo] expecting success: @@ -1695,6 +1716,29 @@ check gitrepo/sub_hg_b HEAD zero_sub_hg_b && check gitrepo/sub_git HEAD zero_sub_git +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files (+1 heads) +new changesets ab35fcd1744a:3f23efd70343 +progress revision 2 'default' (0/2) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + + 5c5d642...202df3d master -> origin/master (forced update) + + 5c5d642...202df3d branches/default -> origin/branches/default (forced update) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + 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 2 changesets with 2 changes to 1 files (+1 heads) +new changesets 211dbae18e8a:fc4898475c8b +progress revision 2 'default' (0/2) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo + + 51003d3...018643f master -> origin/master (forced update) + + 51003d3...018643f branches/default -> origin/branches/default (forced update) ok 4 - hg branch expecting success: @@ -1732,34 +1776,6 @@ Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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 2 changesets with 2 changes to 1 files (+1 heads) -new changesets 81f9383a1887:d009c9efee29 -progress revision 2 'default' (0/2) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - + 8d447e0...f245d8e master -> origin/master (forced update) - + 8d447e0...f245d8e branches/default -> origin/branches/default (forced update) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 3454e0d23da2:b9a01a07bc26 -progress revision 2 'default' (0/2) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - + 8d447e0...4f8038e master -> origin/master (forced update) - + 8d447e0...4f8038e branches/default -> origin/branches/default (forced update) -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] ok 8 - strip expecting success: @@ -1786,13 +1802,6 @@ check_branch hgrepo default two -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 ok 8 - strip expecting success: @@ -1819,96 +1828,103 @@ check_branch hgrepo default two -0 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +no changes found 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) +searching for changes +0 files updated, 0 files merged, 0 files removed, 0 files unresolved Cloning into 'gitrepo'... Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git adding changesets adding manifests adding file changes +searching for changes adding remote bookmark master +adding changesets +adding manifests +adding file changes added 2 changesets with 2 changes to 1 files -new changesets 7181daca55b2:21c6131daab6 +new changesets 05dd5a960a72:8efcc6f22125 +adding remote bookmark not-master +added 1 changesets with 1 changes to 1 files +new changesets 16869bbe54be +1 local changesets published progress revision walk 'bookmarks/default' (1/1) progress revision 0 'default' (0/2) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -[default 0ec24a4] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +progress revision 1 'default' (0/1) adding changesets adding manifests adding file changes adding remote bookmark master added 2 changesets with 2 changes to 1 files -new changesets a1f6ff6f1d1f:9b896760ddd7 +new changesets 2f3b8bc5b3e4:06687eda1808 progress revision walk 'bookmarks/default' (1/1) progress revision 0 'default' (0/2) -[default 252f8f8] two +[default 22ac6b0] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +[default 39d7592] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 -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' /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + fffffff..22ac6b0 default -> default no changes found -hint: Updates were rejected because the tag already exists in the remote. searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - ae2e3bf..0ec24a4 default -> default -Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + b2cdded..39d7592 default -> default +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 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 1 changesets with 1 changes to 1 files -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..252f8f8 default -> default -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +added 2 changesets with 2 changes to 2 files +searching for changes +searching for changes +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' +Cloning into 'gitrepo'... +hint: Updates were rejected because the tag already exists in the remote. ok 9 - remote push with master bookmark expecting success: @@ -1932,13 +1948,6 @@ check_branch hgrepo default one -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 367eb204b4af:731bb84836f9 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) ok 9 - remote push with master bookmark expecting success: @@ -1962,6 +1971,27 @@ check_branch hgrepo default one +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/gitrepo/.git/ +added 2 changesets with 3 changes to 3 files +new changesets 324f8d64f9d1:2c8fb022b8a8 +[master (root-commit) 64caca5] one + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ +[master (root-commit) 64caca5] one + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] ok 5 - hg tags expecting success: @@ -2026,19 +2056,6 @@ Date: Mon Jan 1 00:00:00 2007 -0130 1 file changed, 1 insertion(+) create mode 100644 epsilon -Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ -[master (root-commit) 64caca5] one - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content -Initialized empty Git repository in /build/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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -2051,14 +2068,9 @@ added 1 changesets with 1 changes to 1 files To hg::../hgrepo * [new branch] master -> master -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found no changes found +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] searching for changes adding changesets adding manifests @@ -2066,33 +2078,37 @@ added 1 changesets with 1 changes to 1 files To hg::../hgrepo * [new branch] master -> master -adding changesets -adding manifests -adding file changes -searching for changes -added 1 changesets with 1 changes to 1 files -new changesets 66f2bcb5651f -adding changesets -adding manifests -adding file changes -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -added 5 changesets with 5 changes to 5 files +Cloning into './sub_hg_a'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 -Cloning into './sub_hg_b'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 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 -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 bebc3b994518 +no changes found +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +searching for changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 5 changes to 5 files +Cloning into './sub_hg_b'... ok 10 - remote push from master branch expecting success: @@ -2109,15 +2125,6 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 06f451b454a8 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_git'... -done. ok 10 - remote push from master branch expecting success: @@ -2134,6 +2141,17 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 1c3df454ed9c +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_git'... +done. /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] ok 7 - subcommand sub initial update (hg and git subrepos) @@ -2169,16 +2187,9 @@ progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/5) Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] Cloning into 'gitrepo'... -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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -2187,7 +2198,16 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets df390507ac24 +new changesets bdb0d1e5d474 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 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 bdb0d1e5d474 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 11 - remote cloning @@ -2203,15 +2223,13 @@ ) Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 1 changesets with 1 changes to 1 files -new changesets cdcd5f6f405a -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 5 changesets with 5 changes to 5 files ok 11 - remote cloning expecting success: @@ -2225,6 +2243,8 @@ ) Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -2233,29 +2253,24 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets df390507ac24 +new changesets bdb0d1e5d474 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 cdcd5f6f405a +new changesets bdb0d1e5d474 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -ok 6 - test timezones - -# passed all 6 test(s) -1..6 +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +no changes found ok 12 - moving remote clone expecting success: @@ -2277,7 +2292,6 @@ check_bookmark hgrepo devel devel -no changes found ok 12 - moving remote clone expecting success: @@ -2299,54 +2313,58 @@ check_bookmark hgrepo devel devel +ok 6 - test timezones + +# passed all 6 test(s) +1..6 Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes -adding remote bookmark devel -added 1 changesets with 1 changes to 1 files -new changesets df390507ac24 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -[devel a110f47] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes adding remote bookmark devel +adding remote bookmark devel +added 1 changesets with 1 changes to 1 files +new changesets bdb0d1e5d474 added 1 changesets with 1 changes to 1 files -new changesets cdcd5f6f405a +new changesets bdb0d1e5d474 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel 88d8b28] devel +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[devel 4396775] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[devel 4396775] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] no changes found searching for changes +searching for changes +adding changesets adding changesets adding manifests +adding manifests +adding file changes adding file changes added 1 changesets with 1 changes to 1 files +added 1 changesets with 1 changes to 1 files ok 13 - remote update bookmark expecting success: @@ -2381,11 +2399,8 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -Initialized empty Git repository in /build/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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -2393,41 +2408,44 @@ adding changesets adding manifests adding file changes -adding remote bookmark devel -added 2 changesets with 2 changes to 1 files -new changesets df390507ac24:91791a517113 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -[feature-b 507be07] 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 cdcd5f6f405a:ca3aef5b3503 +adding remote bookmark devel +new changesets bdb0d1e5d474:b5b8ae9aa31b +added 2 changesets with 2 changes to 1 files +new changesets bdb0d1e5d474:b5b8ae9aa31b +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -[feature-b f3a2914] feature-b +[feature-b fab3bfb] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +[feature-b fab3bfb] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +Initialized empty Git repository in /build/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/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found +no changes found searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found searching for changes +added 1 changesets with 1 changes to 1 files adding changesets adding manifests adding file changes @@ -2458,7 +2476,6 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... -Cloning into 'gitrepo'... ok 14 - remote new bookmark expecting success: @@ -2485,6 +2502,8 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -2495,95 +2514,85 @@ adding remote bookmark devel adding remote bookmark feature-b added 3 changesets with 3 changes to 1 files -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -new changesets df390507ac24:f9afae94a893 -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 0b37749a86e8:488377089168 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] adding changesets +new changesets bdb0d1e5d474:75188dc64688 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 cdcd5f6f405a:258e618221b5 +new changesets bdb0d1e5d474:75188dc64688 +Cloning into 'gitrepo'... progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark devel) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark devel) -Cloning into './sub_hg_a'... -[master 0cbb81c] diverged - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -[master 10f2f6a] diverged - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets d950bff6b626:2698f3820b6c +new changesets 804240e6052e:e7c6c4fb1a4d progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into './sub_hg_a/sub_hg_a_x'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +[master e18b846] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[master e18b846] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 3b087644e77b -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo +new changesets dfb027d88995 +To hg::/build/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/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo' +error: failed to push some refs to 'hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] master -> master (non-fast-forward) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 c027c8016356 -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo +new changesets dfb027d88995 +To hg::/build/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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo' +error: failed to push some refs to 'hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] master -> master (non-fast-forward) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 7368d474cb41 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 2 changesets with 3 changes to 3 files +new changesets 2412f2c8fa1a:93c480886676 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_a/sub_hg_a_x'... ok 15 - remote push diverged expecting success: @@ -2615,7 +2624,6 @@ check_bookmark hgrepo diverge "bump bookmark" -Cloning into './sub_hg_b'... ok 15 - remote push diverged expecting success: @@ -2647,32 +2655,35 @@ check_bookmark hgrepo diverge "bump bookmark" -1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 91c546c0800f +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_hg_b'... +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 f2475f52f412:3c07b41948c8 +new changesets 24ed5f9f5942:4c4e57a4731a progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... -Cloning into './sub_hg_b/sub_git'... -done. -Cloning into 'gitrepo'... -ok 8 - subcommand sub initial recursive update - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update - /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes @@ -2680,11 +2691,7 @@ adding remote bookmark diverge adding remote bookmark feature-b added 4 changesets with 4 changes to 1 files -new changesets df390507ac24:3b087644e77b -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/4) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +new changesets bdb0d1e5d474:dfb027d88995 adding changesets adding manifests adding file changes @@ -2692,15 +2699,26 @@ adding remote bookmark diverge adding remote bookmark feature-b added 4 changesets with 4 changes to 1 files -new changesets cdcd5f6f405a:c027c8016356 +new changesets bdb0d1e5d474:dfb027d88995 +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/4) +Cloning into './sub_hg_b/sub_git'... progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) +done. +ok 8 - subcommand sub initial recursive update + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update + +created new head created new head -[diverge bc21d9f] diverge +[diverge 6875fc5] diverge Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -created new head -[diverge b87a896] diverge +[diverge 6875fc5] diverge Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead @@ -2713,7 +2731,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 05e7e090fc28 +new changesets 285333355843 To hg::/build/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/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo' @@ -2730,7 +2748,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 5d4261517ad4 +new changesets 285333355843 To hg::/build/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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo' @@ -2777,6 +2795,8 @@ 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes @@ -2784,15 +2804,10 @@ adding remote bookmark diverge adding remote bookmark feature-b added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets df390507ac24:05e7e090fc28 +new changesets bdb0d1e5d474:285333355843 WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/4) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -[feature-c d2f3bae] feature-c - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes @@ -2800,11 +2815,14 @@ adding remote bookmark diverge adding remote bookmark feature-b added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets cdcd5f6f405a:5d4261517ad4 +new changesets bdb0d1e5d474:285333355843 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 65eb188] feature-c +[feature-c 092b95e] feature-c + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[feature-c 092b95e] feature-c Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead @@ -2812,13 +2830,13 @@ WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] no changes found searching for changes adding changesets @@ -2909,40 +2927,40 @@ 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/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 added 1 changesets with 1 changes to 1 files -new changesets 7e0a5f9fa49d +new changesets 9ffb629133c7 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -[master 2f9098b] copy +adding changesets +adding manifests +adding file changes +[master d5b0219] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master e95de43] moved +added 1 changesets with 1 changes to 1 files +new changesets 9ffb629133c7 +[master 6dd5243] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 7e0a5f9fa49d progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 2f9098b] copy +Initialized empty Git repository in /build/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 d5b0219] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master e95de43] moved +[master 6dd5243] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) @@ -2951,15 +2969,15 @@ WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] searching for changes adding changesets adding manifests adding file changes -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] added 2 changesets with 2 changes to 2 files To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - f6cc547..e95de43 master -> master + abf58e0..6dd5243 master -> master no changes found searching for changes adding changesets @@ -2967,10 +2985,9 @@ adding file changes added 2 changesets with 2 changes to 2 files To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..e95de43 master -> master + fffffff..6dd5243 master -> master 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Cloning into 'gitrepo'... not ok 18 - push commits with copy and rename # TODO known breakage expecting success: @@ -3003,8 +3020,6 @@ echo "ø~?" > expected && test_cmp expected actual -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] ok 18 - push commits with copy and rename expecting success: @@ -3037,60 +3052,70 @@ echo "ø~?" > expected && test_cmp expected actual +Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 ccada7e9602f:041146120efa +new changesets fe5231b1212c:3f0fd973701e 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: 'ø~?' /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] Cloning into './sub_hg_a'... -warning: filename contains '?', which is reserved on Windows: 'ø~?' -warning: filename contains '?', which is reserved on Windows: 'ø~?' /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 cbf842e5adf4:2bab0de54892 +new changesets 72400da23c67:35de3804361f progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into './sub_hg_a/sub_hg_a_x'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +warning: filename contains '?', which is reserved on Windows: 'ø~?' adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 6ace744cc494 +new changesets dc47f49b1f7e 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 './sub_hg_b'... +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -warning: filename contains '?', which is reserved on Windows: 'ø~?' adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets f5ec35b5ace2:8276e8edcf09 +new changesets fe2e43452986:53b145669917 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... -Cloning into './sub_hg_b/sub_git'... -done. -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 3 changesets with 4 changes to 2 files -new changesets 0dceb83a058c:0eb45d182928 +new changesets 58b05fa50b12:8b74f3f9fac3 +Cloning into './sub_hg_b/sub_git'... +done. +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +adding changesets +adding manifests +adding file changes +added 3 changesets with 4 changes to 2 files +new changesets 58b05fa50b12:8b74f3f9fac3 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) ok 19 - fetch special filenames @@ -3131,13 +3156,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 5764966605e0:1515fc9aa81c -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) ok 19 - fetch special filenames expecting success: @@ -3177,49 +3195,47 @@ test_cmp expected actual Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -searching for changes +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 225671fb38f9 -progress revision 2 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - af974e7..8b01255 master -> origin/master - af974e7..8b01255 branches/default -> origin/branches/default -Cloning into 'gitrepo'... -Updating af974e7..8b01255 -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +new changesets 0a7839aa4a0b +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 c5163047043b +new changesets e6a5278d4ba8 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 745bdc1] utf-8 +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +[master 9b3d84c] utf-8 Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 "\303\246 r\303\270" +searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets c5163047043b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -[master 745bdc1] utf-8 +new changesets e4b11decef5e +progress revision 2 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + d210024..9ab568c master -> origin/master + d210024..9ab568c branches/default -> origin/branches/default +[master e14fb87] utf-8 Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 "\303\246 r\303\270" +Updating d210024..9ab568c +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found @@ -3229,32 +3245,32 @@ adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 86fbffb..745bdc1 master -> master -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes + bf1fd37..9b3d84c master -> master no changes found -added 1 changesets with 1 changes to 1 files -new changesets e504116c397c -progress revision 2 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - 9f6026f..5b88e9e branches/default -> origin/branches/default - 9f6026f..5b88e9e master -> origin/master searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..745bdc1 master -> master -HEAD is now at 9f6026f substate_hg_a + fffffff..e14fb87 master -> master +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 a61ac43db18e +progress revision 2 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a + eb6d5f8..a9b1ac8 branches/default -> origin/branches/default + eb6d5f8..a9b1ac8 master -> origin/master +HEAD is now at eb6d5f8 substate_hg_a ok 20 - push special filenames expecting success: @@ -3300,17 +3316,6 @@ check_bookmark hgrepo new_bmark fi -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 816465b79974 -progress revision 1 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 0a21ac1..579648b branches/default -> origin/branches/default - 0a21ac1..579648b master -> origin/master -HEAD is now at 0a21ac1 zero_sub_hg_a_x ok 20 - push special filenames expecting success: @@ -3358,6 +3363,19 @@ /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 7cd2d0759e1f +progress revision 1 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + 4c4c1e6..9093e98 branches/default -> origin/branches/default + 4c4c1e6..9093e98 master -> origin/master +HEAD is now at 4c4c1e6 zero_sub_hg_a_x +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] no changes found ok 9 - subcommand sub subsequent recursive update @@ -3372,8 +3390,6 @@ 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes @@ -3381,7 +3397,12 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 95264fbc05ff:b1ab2cb2c6e9 +new changesets 9b6d190323a4:f656c803bad4 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes @@ -3389,33 +3410,25 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets ff1a942f5f4d:4830a7e115c0 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) +new changesets 9b6d190323a4:f656c803bad4 +HEAD is now at a42df31 zero +HEAD is now at a42df31 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 7ba1446 zero -HEAD is now at 08ddf5d zero -HEAD is now at 08ddf5d zero -HEAD is now at 7ba1446 zero -HEAD is now at 7df77ad good branch -HEAD is now at 2e0f82c good branch -Initialized empty Git repository in /build/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 +HEAD is now at c7bfc23 good branch +HEAD is now at a42df31 zero +HEAD is now at a42df31 zero +HEAD is now at c7bfc23 good branch /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 2e0f82c..1311e24 branches/good_branch -> branches/good_branch - bb47542..439485c good_bmark -> good_bmark - bb47542..e34abcc master -> master + c7bfc23..5aa27de branches/good_branch -> branches/good_branch + 26f742b..3341da3 good_bmark -> good_bmark + 26f742b..33e858e 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) @@ -3426,9 +3439,9 @@ hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - bb47542..e34abcc master -> master - bb47542..439485c good_bmark -> good_bmark - 2e0f82c..1311e24 branches/good_branch -> branches/good_branch + 26f742b..33e858e master -> master + 26f742b..3341da3 good_bmark -> good_bmark + c7bfc23..5aa27de 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) @@ -3463,9 +3476,9 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..60d526a branches/good_branch -> branches/good_branch - fffffff..e87597d good_bmark -> good_bmark - fffffff..78e6035 master -> master + fffffff..5aa27de branches/good_branch -> branches/good_branch + fffffff..3341da3 good_bmark -> good_bmark + fffffff..33e858e master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) @@ -3476,14 +3489,19 @@ hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..78e6035 master -> master - fffffff..e87597d good_bmark -> good_bmark - fffffff..60d526a branches/good_branch -> branches/good_branch + fffffff..33e858e master -> master + fffffff..3341da3 good_bmark -> good_bmark + fffffff..5aa27de 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] @@ -3491,19 +3509,7 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 2529b3c92059:ab65aadc13ce -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 89eacdc91cb5:9be8c24674a8 +new changesets 3e071e31d972:1deec588be4b progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 21 - remote big push @@ -3582,7 +3588,9 @@ fi ) -Cloning into './sub_hg_a/sub_hg_a_x'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... ok 21 - remote big push expecting success: @@ -3664,8 +3672,18 @@ adding changesets adding manifests adding file changes +added 2 changesets with 3 changes to 3 files +new changesets b8b3691f76d6:a00f53d34969 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_a/sub_hg_a_x'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 1caa5c6e11d0 +new changesets a45201f4340e progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) Cloning into './sub_hg_b'... @@ -3675,71 +3693,57 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 2bedc2f5e67a:120e46117bf1 +new changesets 37a7bb4e9ccf:177a1055aa89 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into './sub_hg_b/sub_git'... done. -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 a2e51415d329 -progress revision 2 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - dd39844..caeef19 master -> origin/master - dd39844..caeef19 branches/default -> origin/branches/default -Updating dd39844..caeef19 -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes adding remote bookmark bad_bmark adding remote bookmark good_bmark added 3 changesets with 3 changes to 1 files -new changesets 97acce5a1fe1:9d58a0a2e692 +new changesets 1dce6f76f7f4:29dcdbb3f127 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'bad_branch' (0/2) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 6979416505d8 +progress revision 2 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + fe1c269..6eb28a0 master -> origin/master + fe1c269..6eb28a0 branches/default -> origin/branches/default /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +Updating fe1c269..6eb28a0 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes adding remote bookmark bad_bmark adding remote bookmark good_bmark added 3 changesets with 3 changes to 1 files -new changesets 97acce5a1fe1:c6bb20a3dea8 +new changesets 1dce6f76f7f4:29dcdbb3f127 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'bad_branch' (0/2) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets a4138d190705 -progress revision 2 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - 63972d0..b2ab1b8 branches/default -> origin/branches/default - 63972d0..b2ab1b8 master -> origin/master -HEAD is now at 63972d0 substate_hg_a - Successfully rebased and updated detached HEAD. +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] searching for changes @@ -3747,12 +3751,12 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 85a2ee69f0c0 -progress revision 1 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - f73049c..998b41e branches/default -> origin/branches/default - f73049c..998b41e master -> origin/master -HEAD is now at f73049c zero_sub_hg_a_x +new changesets 67d2b336571a +progress revision 2 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a + f2ebbef..f678fc0 branches/default -> origin/branches/default + f2ebbef..f678fc0 master -> origin/master +HEAD is now at f2ebbef substate_hg_a Successfully rebased and updated detached HEAD. /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] @@ -3764,10 +3768,10 @@ adding file changes updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets ea8b91187d12 +new changesets 57810a556e0d To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 9dc3970..27d68be good_bmark -> good_bmark - 9dc3970..f82a9aa master -> master + ba102d0..32beac1 good_bmark -> good_bmark + ba102d0..cd545b7 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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' @@ -3775,17 +3779,22 @@ hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 9dc3970..f82a9aa master -> master - 9dc3970..27d68be good_bmark -> good_bmark + ba102d0..cd545b7 master -> master + ba102d0..32beac1 good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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 5325fc7601b6 +progress revision 1 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + 67d0f61..82888e2 branches/default -> origin/branches/default + 67d0f61..82888e2 master -> origin/master /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] searching for changes @@ -3794,7 +3803,7 @@ adding file changes updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets 738458ef52d5 +new changesets f2aeb401b75b searching for changes adding changesets adding manifests @@ -3806,8 +3815,8 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..27d68be good_bmark -> good_bmark - fffffff..f82a9aa master -> master + fffffff..32beac1 good_bmark -> good_bmark + fffffff..cd545b7 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' @@ -3815,24 +3824,23 @@ hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..f82a9aa master -> master - fffffff..27d68be good_bmark -> good_bmark + fffffff..cd545b7 master -> master + fffffff..32beac1 good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways no changes found -ok 10 - subcommand sub subsequent recursive update -- rebase - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --merge - progress revision 3 'bad_branch' (0/1) +HEAD is now at 67d0f61 zero_sub_hg_a_x + Successfully rebased and updated detached HEAD. From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 8838808..7d6bb6a branches/bad_branch -> origin/branches/bad_branch - 9dc3970..7d6bb6a bad_bmark -> origin/bad_bmark - + 27d68be...9dc3970 good_bmark -> origin/good_bmark (forced update) - + f82a9aa...9dc3970 master -> origin/master (forced update) + 868d00f..336cd2b branches/bad_branch -> origin/branches/bad_branch + ba102d0..336cd2b bad_bmark -> origin/bad_bmark + + 32beac1...ba102d0 good_bmark -> origin/good_bmark (forced update) + + cd545b7...ba102d0 master -> origin/master (forced update) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] no changes found @@ -3841,17 +3849,20 @@ WARNING: Branch 'default' has more than one head, consider merging progress revision 3 'bad_branch' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 6230a1d..28dde77 branches/bad_branch -> origin/branches/bad_branch - 9dc3970..f82a9aa branches/default -> origin/branches/default - 9dc3970..28dde77 bad_bmark -> origin/bad_bmark + 868d00f..5433798 branches/bad_branch -> origin/branches/bad_branch + ba102d0..cd545b7 branches/default -> origin/branches/default + ba102d0..5433798 bad_bmark -> origin/bad_bmark +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +no changes found /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 9dc3970..27d68be good_bmark -> good_bmark - 9dc3970..f82a9aa master -> master + ba102d0..32beac1 good_bmark -> good_bmark + ba102d0..cd545b7 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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' @@ -3859,8 +3870,8 @@ hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 9dc3970..f82a9aa master -> master - 9dc3970..27d68be good_bmark -> good_bmark + ba102d0..cd545b7 master -> master + ba102d0..32beac1 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 @@ -3907,6 +3918,13 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six +ok 10 - subcommand sub subsequent recursive update -- rebase + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update --merge + /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] no changes found @@ -3964,16 +3982,12 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six -Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 @@ -3981,14 +3995,18 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets e6237f30fa1c:1163ac2b9dad +new changesets 0f03aa9a5922:c58ef95225f5 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -Cloning into 'gitrepo'... -HEAD is now at a90860a zero -HEAD is now at a90860a zero -HEAD is now at 0721a4e good branch +Initialized empty Git repository in /build/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 +HEAD is now at 2ffbc44 zero +HEAD is now at 2ffbc44 zero +HEAD is now at 88ebc2e good branch /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] adding changesets @@ -3998,14 +4016,13 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 37bb46f8eb6f:3e65b02ad2e7 +new changesets 0fcfe20c9638:b968d98a2ff7 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -Cloning into 'gitrepo'... -HEAD is now at c61b65b zero -HEAD is now at c61b65b zero -HEAD is now at 9b07fc6 good branch +HEAD is now at eecc4ea zero +HEAD is now at eecc4ea zero +HEAD is now at d787b4e good branch /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -4017,33 +4034,22 @@ adding file changes added 9 changesets with 9 changes to 1 files (+7 heads) To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + 15c8fbe...75ead7e branches/bad_branch -> branches/bad_branch (forced update) - 0721a4e..aaa4478 branches/good_branch -> branches/good_branch - + 2589221...d9f6ad1 bad_bmark1 -> bad_bmark1 (forced update) - + 2589221...916ee8c bad_bmark2 -> bad_bmark2 (forced update) - 2589221..18a87ae good_bmark -> good_bmark - 2589221..67012ba master -> master + + fa32aff...6c5e81b branches/bad_branch -> branches/bad_branch (forced update) + 88ebc2e..b1888f3 branches/good_branch -> branches/good_branch + + 7939d17...268107c bad_bmark1 -> bad_bmark1 (forced update) + + 7939d17...2cc4bae bad_bmark2 -> bad_bmark2 (forced update) + 7939d17..647b399 good_bmark -> good_bmark + 7939d17..41e2097 master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - 2589221..67012ba master -> master - 2589221..18a87ae good_bmark -> good_bmark - 0721a4e..aaa4478 branches/good_branch -> branches/good_branch + 7939d17..41e2097 master -> master + 7939d17..647b399 good_bmark -> good_bmark + 88ebc2e..b1888f3 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + 2589221...d9f6ad1 bad_bmark1 -> bad_bmark1 (forced update) - + 2589221...916ee8c bad_bmark2 -> bad_bmark2 (forced update) - + 15c8fbe...75ead7e branches/bad_branch -> branches/bad_branch (forced update) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 3109e8255f6f:2c8d5acfed12 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] + + 7939d17...268107c bad_bmark1 -> bad_bmark1 (forced update) + + 7939d17...2cc4bae bad_bmark2 -> bad_bmark2 (forced update) + + fa32aff...6c5e81b branches/bad_branch -> branches/bad_branch (forced update) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] no changes found @@ -4088,43 +4094,45 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...ad43099 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...f8caaa0 branches/good_branch -> branches/good_branch (forced update) - + fffffff...a56fca0 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...290f5c5 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...2623d03 good_bmark -> good_bmark (forced update) - + fffffff...7086964 master -> master (forced update) + + fffffff...d6d8777 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...e45e269 branches/good_branch -> branches/good_branch (forced update) + + fffffff...24ec3df bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...9fed773 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...39598db good_bmark -> good_bmark (forced update) + + fffffff...1aefdf4 master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...7086964 master -> master (forced update) - + fffffff...2623d03 good_bmark -> good_bmark (forced update) - + fffffff...f8caaa0 branches/good_branch -> branches/good_branch (forced update) + + fffffff...1aefdf4 master -> master (forced update) + + fffffff...39598db good_bmark -> good_bmark (forced update) + + fffffff...e45e269 branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...a56fca0 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...290f5c5 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...ad43099 branches/bad_branch -> branches/bad_branch (forced update) -Cloning into './sub_hg_a'... + + fffffff...24ec3df bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...9fed773 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...d6d8777 branches/bad_branch -> branches/bad_branch (forced update) +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 108ec24527ba:9967598f8874 +new changesets def62df8c45f:fbe0aacdca2b progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into './sub_hg_a/sub_hg_a_x'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 f5b997648d3b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... +added 2 changesets with 3 changes to 3 files +new changesets 78eed7483042:e7491d708369 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_a/sub_hg_a_x'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] ok 23 - remote big push force @@ -4169,12 +4177,11 @@ adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 85714a4b7b78:32660b1408c4 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. +added 1 changesets with 1 changes to 1 files +new changesets af270babe587 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_hg_b'... ok 23 - remote big push force expecting success: @@ -4216,17 +4223,28 @@ /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 4d512c0e7e8d:58a0ce3aaf2f +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_b/sub_git'... +done. +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 3d8e5d90deba +new changesets 62323e1ada79 progress revision 2 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 97e4667..6b48b86 master -> origin/master - 97e4667..6b48b86 branches/default -> origin/branches/default -Updating 97e4667..6b48b86 + 085e39a..b643a44 master -> origin/master + 085e39a..b643a44 branches/default -> origin/branches/default +Updating 085e39a..b643a44 Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -4239,16 +4257,17 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 91be2b59ee45 +new changesets 26d3d164954a progress revision 2 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - 5d23479..0c26395 branches/default -> origin/branches/default - 5d23479..0c26395 master -> origin/master -HEAD is now at 5d23479 substate_hg_a -Updating 5d23479..0c26395 + 3298453..9e44bcf branches/default -> origin/branches/default + 3298453..9e44bcf master -> origin/master +HEAD is now at 3298453 substate_hg_a +Updating 3298453..9e44bcf Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] searching for changes @@ -4256,46 +4275,38 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 76ede752206c +new changesets 8d3a9d210149 progress revision 1 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 5dd863a..6b2adaf branches/default -> origin/branches/default - 5dd863a..6b2adaf master -> origin/master -HEAD is now at 5dd863a zero_sub_hg_a_x -Updating 5dd863a..6b2adaf -Fast-forward - content_sub_hg_a_x | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found + 39c1924..db90f07 branches/default -> origin/branches/default + 39c1924..db90f07 master -> origin/master /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +HEAD is now at 39c1924 zero_sub_hg_a_x +Updating 39c1924..db90f07 +Fast-forward + content_sub_hg_a_x | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes adding remote bookmark bad_bmark1 adding remote bookmark bad_bmark2 adding remote bookmark good_bmark -ok 11 - subcommand sub subsequent recursive update -- merge - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_foreach - added 4 changesets with 4 changes to 1 files -new changesets e47dfbcbc554:b6378c1f11e3 +new changesets f5570dafc826:24ee68c9edc2 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) Cloning into 'gitrepo'... -HEAD is now at dbe26e1 zero -HEAD is now at dbe26e1 zero -HEAD is now at 548398d good branch +HEAD is now at d8c8fc9 zero +HEAD is now at d8c8fc9 zero +HEAD is now at 493113b good branch +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +no changes found /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] adding changesets @@ -4305,22 +4316,29 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 45b1e786ef91:17db8ac76d27 +new changesets f9bc3cc171d3:7c6360c83f6b progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at f46716e zero -HEAD is now at f46716e zero -HEAD is now at 295b319 good branch +ok 11 - subcommand sub subsequent recursive update -- merge + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_foreach + +HEAD is now at a5e54a6 zero +HEAD is now at a5e54a6 zero +HEAD is now at bbbc381 good branch /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 548398d..a138f3b branches/good_branch -> branches/good_branch - 76997fd..51a376e good_bmark -> good_bmark - 76997fd..9402986 master -> master + 493113b..9d245cf branches/good_branch -> branches/good_branch + d41e14c..9eef674 good_bmark -> good_bmark + d41e14c..aaa8511 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) @@ -4331,9 +4349,9 @@ hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 76997fd..9402986 master -> master - 76997fd..51a376e good_bmark -> good_bmark - 548398d..a138f3b branches/good_branch -> branches/good_branch + d41e14c..aaa8511 master -> master + d41e14c..9eef674 good_bmark -> good_bmark + 493113b..9d245cf 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) @@ -4345,23 +4363,23 @@ WARNING: various enhanced features might fail in subtle ways no changes found To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 548398d..a138f3b branches/good_branch -> branches/good_branch - 76997fd..51a376e good_bmark -> good_bmark - 76997fd..9402986 master -> master + 493113b..9d245cf branches/good_branch -> branches/good_branch + d41e14c..9eef674 good_bmark -> good_bmark + d41e14c..aaa8511 master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - 76997fd..9402986 master -> master - 76997fd..51a376e good_bmark -> good_bmark - 548398d..a138f3b branches/good_branch -> branches/good_branch + d41e14c..aaa8511 master -> master + d41e14c..9eef674 good_bmark -> good_bmark + 493113b..9d245cf branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] no changes found To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..f2e4e42 branches/good_branch -> branches/good_branch - fffffff..5226ef3 good_bmark -> good_bmark - fffffff..27607e9 master -> master + fffffff..2d26ecb branches/good_branch -> branches/good_branch + fffffff..31c32a1 good_bmark -> good_bmark + fffffff..6a53758 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) @@ -4372,9 +4390,9 @@ hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..27607e9 master -> master - fffffff..5226ef3 good_bmark -> good_bmark - fffffff..f2e4e42 branches/good_branch -> branches/good_branch + fffffff..6a53758 master -> master + fffffff..31c32a1 good_bmark -> good_bmark + fffffff..2d26ecb 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) @@ -4384,14 +4402,14 @@ or locale.getdefaultlocale()[1] no changes found To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..f2e4e42 branches/good_branch -> branches/good_branch - fffffff..5226ef3 good_bmark -> good_bmark - fffffff..27607e9 master -> master + fffffff..2d26ecb branches/good_branch -> branches/good_branch + fffffff..31c32a1 good_bmark -> good_bmark + fffffff..6a53758 master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - fffffff..27607e9 master -> master - fffffff..5226ef3 good_bmark -> good_bmark - fffffff..f2e4e42 branches/good_branch -> branches/good_branch + fffffff..6a53758 master -> master + fffffff..31c32a1 good_bmark -> good_bmark + fffffff..2d26ecb branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ok 24 - remote big push dry-run @@ -4439,11 +4457,6 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -Initialized empty Git repository in /build/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 ok 24 - remote big push dry-run expecting success: @@ -4489,6 +4502,11 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] @@ -4496,7 +4514,7 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets be0b27375fb3:4da254cefc26 +new changesets 7f3f18a9650a:4255cce98a45 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead @@ -4508,36 +4526,24 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets b77151488e45:9204243003ce +new changesets a4be61836d6d:f8ffeb0fc109 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 9b6b3b5650c2 +new changesets 6cd167e3d178 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... -Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 f9c8a3e8e384:d18fe149b34b -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 @@ -4545,35 +4551,90 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 92a9df62da08:47022f28eda4 +new changesets 0f5dd72fcdbc:e1ea63fb4a27 +Cloning into 'gitrepo'... progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -Cloning into 'gitrepo'... -HEAD is now at e783f4f zero -HEAD is now at e783f4f zero -HEAD is now at 3b1c44c good branch -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +Cloning into './sub_hg_b'... +HEAD is now at 6e43400 zero +HEAD is now at 6e43400 zero +HEAD is now at b9d7c1f good branch /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 +adding changesets +adding manifests +adding file changes added 4 changesets with 4 changes to 1 files -new changesets 231e9b6787fc:6cbbb48467a2 +new changesets 75c7f211f486:351d5cb94de8 +added 2 changesets with 3 changes to 3 files +new changesets bef970577d36:5fc615236dbb +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 7c5c786 zero -hg 583e99e68e8263716b5b91c22e49be82b1d39866 9204243003ce55fa9380273e6c985fd080eb68be sub_hg_a /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo -hg ad518fc30a747526a4482195b5cdd4dc4c98a878 9b6b3b5650c2ec4d5c5ed68b46b694231a4617af sub_hg_a_x /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a -hg 4d210aae6114e957702e2a60908621beb4804ebf d18fe149b34bd87b5b8b3dc8a9171a094d364c0d sub_hg_b /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +HEAD is now at 38d72cf zero +HEAD is now at 38d72cf zero +Cloning into './sub_hg_b/sub_git'... +done. +HEAD is now at f7aa9a0 good branch +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + 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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + + 3ae4857...fbb196d branches/bad_branch -> branches/bad_branch (forced update) + b9d7c1f..8c72887 branches/good_branch -> branches/good_branch + + 86c7e31...44ffd68 bad_bmark1 -> bad_bmark1 (forced update) + + 86c7e31...365b3c3 bad_bmark2 -> bad_bmark2 (forced update) + 86c7e31..947fa27 good_bmark -> good_bmark + 86c7e31..f277937 master -> master + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + 86c7e31..f277937 master -> master + 86c7e31..947fa27 good_bmark -> good_bmark + b9d7c1f..8c72887 branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + 86c7e31...44ffd68 bad_bmark1 -> bad_bmark1 (forced update) + + 86c7e31...365b3c3 bad_bmark2 -> bad_bmark2 (forced update) + + 3ae4857...fbb196d branches/bad_branch -> branches/bad_branch (forced update) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +no changes found +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + + fffffff...616f17b branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...eadd16d branches/good_branch -> branches/good_branch (forced update) + + fffffff...9207289 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...7034c04 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...fa50e5f good_bmark -> good_bmark (forced update) + + fffffff...2edafd4 master -> master (forced update) + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + + fffffff...2edafd4 master -> master (forced update) + + fffffff...fa50e5f good_bmark -> good_bmark (forced update) + + fffffff...eadd16d branches/good_branch -> branches/good_branch (forced update) + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + fffffff...9207289 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...7034c04 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...616f17b branches/bad_branch -> branches/bad_branch (forced update) +hg 6521c2301a99cbdb94b29a674c346795e937925a f8ffeb0fc109383c262bb1b4a6df8d267869b285 sub_hg_a /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg 247c8e3ee82b2fca6f5ee64213d0dde50db9bff0 6cd167e3d17836fccd7996f732399f145166b0d2 sub_hg_a_x /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a +hg ff821f37797840f66303cb5a4f48fe8166ce5774 5fc615236dbb7ff75448bad43489cbe05c536d70 sub_hg_b /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo git e9a16bb7c08361f85ab0002e4094b4229fefb384 e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_b -HEAD is now at 7c5c786 zero ok 12 - subcommand sub foreach expecting success: @@ -4606,50 +4667,6 @@ test_cmp expected actual ) -HEAD is now at d810f95 good branch -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + 6f19f63...5bb860c branches/bad_branch -> branches/bad_branch (forced update) - 3b1c44c..8e2829f branches/good_branch -> branches/good_branch - + cb50fd4...043833a bad_bmark1 -> bad_bmark1 (forced update) - + cb50fd4...f01a172 bad_bmark2 -> bad_bmark2 (forced update) - cb50fd4..70f0b92 good_bmark -> good_bmark - cb50fd4..8a9054e master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - cb50fd4..8a9054e master -> master - cb50fd4..70f0b92 good_bmark -> good_bmark - 3b1c44c..8e2829f branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + cb50fd4...043833a bad_bmark1 -> bad_bmark1 (forced update) - + cb50fd4...f01a172 bad_bmark2 -> bad_bmark2 (forced update) - + 6f19f63...5bb860c branches/bad_branch -> branches/bad_branch (forced update) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...78c0656 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...92dab6c branches/good_branch -> branches/good_branch (forced update) - + fffffff...b8c238d bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...cfbd076 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...fc1bbfb good_bmark -> good_bmark (forced update) - + fffffff...c3fb6f4 master -> master (forced update) - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - + fffffff...c3fb6f4 master -> master (forced update) - + fffffff...fc1bbfb good_bmark -> good_bmark (forced update) - + fffffff...92dab6c branches/good_branch -> branches/good_branch (forced update) - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + fffffff...b8c238d bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...cfbd076 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...78c0656 branches/bad_branch -> branches/bad_branch (forced update) -Cloning into 'gitrepo'... ok 25 - remote big push force dry-run expecting success: @@ -4675,15 +4692,7 @@ test_expect_code 1 git push ) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 d9e486860c18:201701a0495a -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... ok 25 - remote big push force dry-run expecting success: @@ -4709,38 +4718,80 @@ test_expect_code 1 git push ) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 d2994fc97709:1089d2125495 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] Cloning into './sub_hg'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + 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 624b072288b6:043e330f5337 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +HEAD is now at 92fed3f zero +[master 48e8952] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 923e0bbd37b8 +new changesets 525469f5712f progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... - url = foobar /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' + url = foobar +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. Integrate the remote changes (e.g. +hint: '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 added 2 changesets with 2 changes to 1 files -new changesets e27cf6031bf7:a8cd8fdf35e5 +new changesets 8900c45d5a6a:b2aa5ac9d320 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -HEAD is now at a75c1d7 zero -[master a7c4a7d] two +HEAD is now at 5783a4f zero +[master 80b630c] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + 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/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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' ok 13 - subcommand sub sync expecting success: @@ -4805,39 +4856,6 @@ check_branch hgclone/sub_hg default one_sub_hg && check hgclone/sub_git HEAD one_sub_git -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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/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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. Integrate the remote changes (e.g. -hint: '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 -added 2 changesets with 2 changes to 1 files -new changesets bc7dee3df1f0:f7920615c00a -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -HEAD is now at bdb506e zero -[master 964b550] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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/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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] hint: Updates were rejected because the tip of your current branch is behind @@ -4924,58 +4942,53 @@ ! grep feature-a out ) +Cloning into 'gitrepo'... Initialized empty Git repository in /build/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'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes adding remote bookmark feature-a added 2 changesets with 2 changes to 1 files -new changesets 4376f0d2c9d3:8354dc3ada79 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 7a6e979a407e:fb1671087ced +new changesets 87005e6d858b:6a9b51ab36b4 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -Cloning into './sub_hg'... +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes adding remote bookmark feature-a added 2 changesets with 2 changes to 1 files -new changesets d32b12c705fb:7304e5877afe -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +new changesets ad913d95d3ba:38e5dcbe2f20 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) no changes found error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - [deleted] (none) -> origin/feature-a -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 74e5ff5f17f9:62733f8c41b4 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 27 - fetch prune expecting success: @@ -5020,27 +5033,15 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 80f72493b83f -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_git'... -done. -[detached HEAD 966272f] one_sub_hg - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into './sub_hg'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] no changes found error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - [deleted] (none) -> origin/feature-a -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found ok 27 - fetch prune expecting success: @@ -5085,56 +5086,89 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 eba494bc0a30 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_git'... +done. +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +[detached HEAD 3165b4c] one_sub_hg + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - fffffff..966272f HEAD -> master + fffffff..3165b4c HEAD -> master +created new head +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/gitrepo/ +0 files updated, 0 files merged, 1 files removed, 0 files unresolved /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -0 files updated, 0 files merged, 1 files removed, 0 files unresolved no changes found 1 local changesets published From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - 9f094b3..966272f branches/default -> origin/branches/default + 5801d8a..3165b4c branches/default -> origin/branches/default +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways [detached HEAD cea1af1] one_sub_git Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) To /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git * [new branch] HEAD -> new +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files (+1 heads) +new changesets 49e42c6d9625:5d652819bc9a +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 +created new head /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -created new head -Updating ./sub_hg to f26b0132a05ead441c4904cb97da65f810965268 [git 966272f] +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/gitrepo/ +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +Updating ./sub_hg to e1c6f9c5c8d47e6d82472316dc6abc0f70f02291 [git 3165b4c] Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] -Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/gitrepo/ diff --git a/.hgsubstate b/.hgsubstate -index eefea4c..99b1bf1 100644 +index f62789b..92ea835 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -1,2 +1,2 @@ -e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git --80f72493b83f5866fbec5fdc69886cd49cdfafdc sub_hg +-eba494bc0a3010f0c7f29320cc587f76479f24ac sub_hg +cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git -+f26b0132a05ead441c4904cb97da65f810965268 sub_hg ++e1c6f9c5c8d47e6d82472316dc6abc0f70f02291 sub_hg M .hgsubstate -[master f83d462] update_sub +[master 8cb21e2] update_sub Author: A U Thor 1 file changed, 2 insertions(+), 2 deletions(-) -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 dab2abc14f51:88c41a67d56f +new changesets 7f96bf0490ec:eda90e2a6ea5 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) @@ -5143,6 +5177,8 @@ * [new branch] master -> master * [new branch] branches/default -> origin/branches/default * [new branch] master -> origin/master +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] no changes found searching for changes adding changesets @@ -5150,33 +5186,7 @@ adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - fffffff..f83d462 master -> master -created new head -Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/gitrepo/ -1 files updated, 0 files merged, 1 files removed, 0 files unresolved -Cloning into '/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgclone/sub_git'... -done. -Switched to a new branch 'new' -updating to branch default -cloning subrepo sub_git from /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git -cloning subrepo sub_hg from /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg -3 files updated, 0 files merged, 0 files removed, 0 files unresolved -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 f4dc62d5b313:5f96fee2b35c -WARNING: Branch 'default' has more than one head, consider merging -WARNING: Branch 'default' has more than one head, consider merging -progress revision 1 'default' (0/1) -From hg::../hgrepo - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] branches/default -> origin/branches/default - * [new branch] master -> origin/master -0 files updated, 0 files merged, 0 files removed, 0 files unresolved + fffffff..8cb21e2 master -> master /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -5187,57 +5197,20 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 6448753da4eb +new changesets b70d8f5d33aa WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'branches/default' (2/2) progress revision 0 'default' (0/2) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + 0810189...416fd93 branches/default -> origin/branches/default (forced update) - + 0810189...416fd93 master -> origin/master (forced update) -ok 14 - subcommand sub addstate - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repo hg hgrepo && - ( - cd hgrepo && - setup_repo hg sub_hg_a && - setup_repo hg sub_hg_b && - setup_repo git sub_git && - echo "sub_hg_a = sub_hg_a" > .hgsub && - echo "sub_hg_b = sub_hg_b" >> .hgsub && - echo "sub_git = [git]sub_git" >> .hgsub && - hg add .hgsub && - hg commit -m substate - ) - - git clone hg::hgrepo gitrepo && - - ( - cd gitrepo && - git-hg-helper sub update --force sub_hg_a && - git-hg-helper sub update --force sub_git && - ( - # advance and add a tag to the git repo - cd sub_git && - echo one > content_sub_git && - git add content_sub_git && - git commit -m one_sub_git && - git tag feature-a - ) && - - git-hg-helper sub status --cached > output && - cat output && - grep "^ .*sub_hg_a (.*master.*)$" output && - grep "^-.*sub_hg_b$" output && - grep "^+.*sub_git (feature-a~1)$" output && - git-hg-helper sub status sub_git > output && - cat output && - grep "^+.*sub_git (feature-a)$" output > actual && - test_cmp output actual - ) - + + 1769bea...85f6734 branches/default -> origin/branches/default (forced update) + + 1769bea...85f6734 master -> origin/master (forced update) +Cloning into '/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgclone/sub_git'... +done. +Switched to a new branch 'new' +updating to branch default +cloning subrepo sub_git from /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git +cloning subrepo sub_hg from /build/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 ok 28 - fetch multiple independent histories expecting success: @@ -5264,6 +5237,7 @@ git push origin bookmark ) +0 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] searching for changes @@ -5271,13 +5245,13 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets e9890ce13977 +new changesets 2bca559a0d23 WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'branches/default' (2/2) progress revision 0 'default' (0/2) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + 33f8297...666138b branches/default -> origin/branches/default (forced update) - + 33f8297...666138b master -> origin/master (forced update) + + 19f3574...80b03c1 branches/default -> origin/branches/default (forced update) + + 19f3574...80b03c1 master -> origin/master (forced update) ok 28 - fetch multiple independent histories expecting success: @@ -5304,6 +5278,50 @@ git push origin bookmark ) +ok 14 - subcommand sub addstate + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repo hg hgrepo && + ( + cd hgrepo && + setup_repo hg sub_hg_a && + setup_repo hg sub_hg_b && + setup_repo git sub_git && + echo "sub_hg_a = sub_hg_a" > .hgsub && + echo "sub_hg_b = sub_hg_b" >> .hgsub && + echo "sub_git = [git]sub_git" >> .hgsub && + hg add .hgsub && + hg commit -m substate + ) + + git clone hg::hgrepo gitrepo && + + ( + cd gitrepo && + git-hg-helper sub update --force sub_hg_a && + git-hg-helper sub update --force sub_git && + ( + # advance and add a tag to the git repo + cd sub_git && + echo one > content_sub_git && + git add content_sub_git && + git commit -m one_sub_git && + git tag feature-a + ) && + + git-hg-helper sub status --cached > output && + cat output && + grep "^ .*sub_hg_a (.*master.*)$" output && + grep "^-.*sub_hg_b$" output && + grep "^+.*sub_git (feature-a~1)$" output && + git-hg-helper sub status sub_git > output && + cat output && + grep "^+.*sub_git (feature-a)$" output > actual && + test_cmp output actual + ) + Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] @@ -5314,13 +5332,13 @@ adding file changes adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -new changesets ebb9e46a5420 +new changesets bea668bda359 WARNING: Ignoring invalid bookmark 'bookmark' progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) origin hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (fetch) origin hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (push) -[bookmark 869f49d] b +[bookmark 200bfa2] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b @@ -5330,8 +5348,6 @@ WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] WARNING: Ignoring invalid bookmark 'bookmark' searching for changes adding changesets @@ -5340,15 +5356,8 @@ added 1 changesets with 1 changes to 1 files To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new branch] bookmark -> bookmark -adding changesets -adding manifests -adding file changes -adding remote bookmark bookmark -added 1 changesets with 1 changes to 1 files -new changesets 7cf2ba0fdf88 -WARNING: Ignoring invalid bookmark 'bookmark' -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] ok 29 - clone remote with null bookmark, then push expecting success: @@ -5369,17 +5378,21 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual +adding changesets +adding manifests +adding file changes +adding remote bookmark bookmark +added 1 changesets with 1 changes to 1 files +new changesets 37691511badb +WARNING: Ignoring invalid bookmark 'bookmark' +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) origin hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (fetch) origin hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (push) -[bookmark f36df15] b +[bookmark 64bff1a] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b -Initialized empty Git repository in /build/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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] no changes found @@ -5411,17 +5424,12 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual +Initialized empty Git repository in /build/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'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 db9d34c6e155:6b4d2f7e8b51 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -5430,15 +5438,11 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 8ff83b7beb60:5de785c7ef88 +new changesets 446f50163106:0e8524132af0 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... +Cloning into 'gitrepo'... ok 30 - notes checking known breakage: @@ -5465,24 +5469,29 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 71c98eaf1728:fb5e6e71dbea +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +added 2 changesets with 3 changes to 3 files +new changesets 4ad5acbb7be4:98ae0664c3f9 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 49e64b7108e7 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 2 changesets with 2 changes to 1 files +new changesets c250e3009a2a:7369707179e2 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... ok 30 - notes expecting success: @@ -5509,16 +5518,16 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -Cloning into './sub_git'... -done. -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 05210d22e429 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -5527,60 +5536,52 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 684fedba3c2a +new changesets 35ded9314e3f progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -[master 3f7ce11] two +[master 36ee982] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) - a301bc1c88a708a166108a056a754fa602ae8fb9 ./sub_hg_a (heads/master) --6742b1523fff735788c2b67536dc9f4d3f6f548c[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) - a301bc1c88a708a166108a056a754fa602ae8fb9 ./sub_hg_a (heads/master) --6742b1523fff735788c2b67536dc9f4d3f6f548c[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] no changes found searching for changes /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +Cloning into './sub_git'... adding changesets adding manifests adding file changes +done. added 1 changesets with 1 changes to 1 files To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 48df2ab..3f7ce11 master -> master + 6ffdcc6..36ee982 master -> master +[detached HEAD cea1af1] one_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 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 ba38e49bfb1e -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) +new changesets d9253ebcfc6d progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -ok 15 - subcommand sub status - -# passed all 15 test(s) -1..15 -[master 81d9765] two +[master 20742d1] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) ---- expected 2024-05-16 10:06:18.242619220 +0000 -+++ actual 2024-05-16 10:06:18.358619220 +0000 +--- expected 2023-04-14 03:49:32.001207726 +0000 ++++ actual 2023-04-14 03:49:32.141209097 +0000 @@ -1,4 +1,3 @@ --5e3606f0186f6d68741496ea95b349885387f2b2 +-c66c5ce6a7ab82bd077c535e536c49217d21fb28 - 684fedba3c2a557fd8e95503cfd24fecd30f9768 + 35ded9314e3f133c2e0457fe98c1364769d74112 not ok 31 - push updates notes # TODO known breakage @@ -5608,6 +5609,14 @@ check_bookmark hgrepo feature-a two +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] + 17d4e7ecec16de2c307afef41e71226c3dab0e2a ./sub_hg_a (heads/master) +-4e436b0d839b54b653c87083c482815fa80faed1[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) + 17d4e7ecec16de2c307afef41e71226c3dab0e2a ./sub_hg_a (heads/master) +-4e436b0d839b54b653c87083c482815fa80faed1[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] no changes found @@ -5617,7 +5626,16 @@ adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..81d9765 master -> master + fffffff..20742d1 master -> master +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 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 ok 31 - push updates notes expecting success: @@ -5653,10 +5671,10 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 96813d2f3fa4 +new changesets 6d0afb5e0491 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 124fad7] two +[master bf97ba5] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) Cloning into 'gitrepo'... @@ -5671,17 +5689,17 @@ adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - bf0bc50..124fad7 master -> master + cd17790..bf97ba5 master -> master /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 bd18565142aa +new changesets 50c4bccfa775 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 4f7cb0d] two +[master ce74b46] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead @@ -5702,7 +5720,7 @@ adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..4f7cb0d master -> master + fffffff..ce74b46 master -> master ok 32 - push bookmark without changesets expecting success: @@ -5763,35 +5781,35 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 63bd8b8cdeab +new changesets deea40fa2587 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + 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 d3d84211c45c +new changesets 890f2f50425b progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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 b2b17b32dea8 +new changesets d3ff63518779 progress revision 1 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 78e7e13..b312184 master -> origin/master - 78e7e13..b312184 branches/default -> origin/branches/default + fa7fe74..c281a75 master -> origin/master + fa7fe74..c281a75 branches/default -> origin/branches/default * [new tag] v1.0 -> v1.0 -Updating 78e7e13..b312184 +Updating fa7fe74..c281a75 Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -5838,13 +5856,13 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 3897b55e0e1d +new changesets 7dc8fdf8c51d progress revision 1 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 3729e2a..7e7eeaa master -> origin/master - 3729e2a..7e7eeaa branches/default -> origin/branches/default + f4f81de..0adc42f master -> origin/master + f4f81de..0adc42f branches/default -> origin/branches/default * [new tag] v1.0 -> v1.0 -Updating 3729e2a..7e7eeaa +Updating f4f81de..0adc42f Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -5899,7 +5917,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 4d6dd5024853:d18ff5d83924 +new changesets 1b601ca64263:badf8c123a14 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) @@ -5919,14 +5937,14 @@ adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 168be93..c542a38 master -> master + cdb2143..1d0248c master -> master /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 e8d1814e1fdb:c5c17a39de49 +new changesets 60886d75a532:7e50d8736dd9 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) @@ -5967,7 +5985,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..8f0b92e master -> master + fffffff..aba2915 master -> master ok 34 - push merged named branch expecting success: @@ -6001,7 +6019,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets e9d0f9ef4889 +new changesets b86a6d3e6fd0 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) Cloning into 'gitrepo'... @@ -6023,7 +6041,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 95381dd46ec7 +new changesets e988ba8f5ccc progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 35 - light tag sets author @@ -6101,16 +6119,16 @@ or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets e27989d049ad:bd3cdbb90b9c +new changesets f415d44aac47:b890afb83318 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'feature' (0/1) +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) * master Switched to a new branch 'branches/feature' branch 'branches/feature' set up to track 'origin/branches/feature'. @@ -6133,7 +6151,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets ce484168ca5f:9fbeaea32143 +new changesets 427630250e65:6d2955315c77 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'feature' (0/1) @@ -6199,7 +6217,7 @@ adding manifests adding file changes added 2 changesets with 1 changes to 1 files -new changesets 1aba740e1a64:810865af2096 +new changesets 112d9ebe8ecb:3d153f342654 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 37 - cloning a removed file works @@ -6232,7 +6250,7 @@ adding manifests adding file changes added 2 changesets with 1 changes to 1 files -new changesets 4f9aff10628c:dd32e545e4a6 +new changesets 357070efc7b4:7fc24224566d progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 37 - cloning a removed file works @@ -6267,7 +6285,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 8fad68e5acf7:c8ffb5669cfa +new changesets 656d48e444e1:af46bbca67b7 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 38 - cloning a file replaced with a directory @@ -6302,7 +6320,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 85c63341aa23:90c94c8137f7 +new changesets 742f57730ad7:ce2110d5d3ca progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 38 - cloning a file replaced with a directory @@ -6339,7 +6357,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets e5f32b3adac7:7909d1cad483 +new changesets d66f4e565037:d485f1537961 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 39 - clone replace directory with a file @@ -6372,7 +6390,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets e07109e2e91a:3eb35b74cf98 +new changesets cf0e201e7802:bed6a3508ad7 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 39 - clone replace directory with a file @@ -6408,16 +6426,16 @@ or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -marked working directory as branch parent/child adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files -new changesets 7eeb2688343c:23caf6fa00cd +new changesets 0c2f061d639b:9c569978be6d 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) +marked working directory as branch parent/child ok 40 - clone can ignore invalid refnames expecting success: @@ -6454,11 +6472,12 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -new changesets 1e09367d77d2:3da534627572 +new changesets c2a26e29a020:8ba6e4e2ef4c WARNING: Ignoring matched branch parent/child progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'parent' (0/1) +Cloning into 'gitrepo'... ok 40 - clone can ignore invalid refnames expecting success: @@ -6488,7 +6507,6 @@ test_cmp expected actual -Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -6497,15 +6515,15 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 9b953972da0c +new changesets 6b240c1effa4 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -Cloning into 'gitrepo'... no changes found +Cloning into 'gitrepo'... searching for changes adding changesets adding manifests @@ -6519,7 +6537,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 7cc90deb8bb4 +new changesets d78715f8186c progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 41 - push annotated tag @@ -6592,8 +6610,8 @@ 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 'gitrepo1'... +no changes found searching for changes adding changesets adding manifests @@ -6604,12 +6622,17 @@ Cloning into 'gitrepo2'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +no changes found +warning: You appear to have cloned an empty repository. /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 adding changesets adding manifests adding file changes @@ -6617,11 +6640,6 @@ new changesets e522f351d13b progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master (root-commit) 9f40cc0] two - Author: A U Thor - Date: Mon Sep 26 00:00:00 2016 -0230 - 1 file changed, 1 insertion(+) - create mode 100644 content ok 42 - timezone issues with negative offsets # still have 2 known breakage(s) @@ -6679,7 +6697,7 @@ adding file changes adding remote bookmark feature-a added 1 changesets with 1 changes to 1 files -new changesets 08d279697fdc +new changesets 5ee0457abfbb progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead @@ -6726,10 +6744,10 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 80d57b90c458 +new changesets 1b34ad69e573 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master b259a36] one +[master 224db34] one Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead @@ -6775,7 +6793,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 9bdbc692d318 +new changesets 9527f7c89bab progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -6795,19 +6813,19 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets 5ea017327ce0:7949ad725d3d +new changesets 1519ca7be991:d7b9adf7c6e7 progress revision 1 'default' (0/5) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - d249060..38f7342 master -> origin/master - d249060..38f7342 branches/default -> origin/branches/default -HEAD is now at 38f7342 restored + 1a5bf08..f2517e7 master -> origin/master + 1a5bf08..f2517e7 branches/default -> origin/branches/default +HEAD is now at f2517e7 restored /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] no changes found To hg::/build/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 ff94ff0e5d283fa063ae9cfead73e07a5ab9af37) + ! [remote rejected] master -> master (rejected not pushing hg based commit 8b275ead2d7a6cac75c83e467cebde302eca85f3) error: failed to push some refs to 'hg::/build/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 ff94ff0e5d283fa063ae9cfead73e07a5ab9af37) + ! [remote rejected] master -> master (rejected not pushing hg based commit 8b275ead2d7a6cac75c83e467cebde302eca85f3) ok 45 - check-hg-commits with fail mode expecting success: @@ -6831,23 +6849,23 @@ or locale.getdefaultlocale()[1] progress revision 1 'default' (0/5) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 7f70c08..b7bcb05 master -> origin/master - 7f70c08..b7bcb05 branches/default -> origin/branches/default -HEAD is now at b7bcb05 restored + 0ea177e..c5ae5f2 master -> origin/master + 0ea177e..c5ae5f2 branches/default -> origin/branches/default +HEAD is now at c5ae5f2 restored /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -WARNING: Pushing hg changeset 6122d55e0f5dda25564fdce5d5f4820aa14e6c03 for cc271dda2604279b12c66cfb563e9f3e1e475e6d -WARNING: Pushing hg changeset db0fdf108108ae0634019b56b6825bb90fe39c4c for 8799d3009b1a55e17cf1648bb83c2c4a2a1e6178 -WARNING: Pushing hg changeset 2cbf923693952aade327616d29deff9fa0f0fd62 for 8a55050f5d599619845df726be69a5ea556df63b -WARNING: Pushing hg changeset e65bf39aeea76f5ea283a3c54bdf80abea5ab524 for a52aa72cf6d3043b0b78d37c4f821d4b42d9ae53 -WARNING: Pushing hg changeset 623bf252fad15d6f71e4d13eea7f47b212e49bc2 for b7bcb05158565b27bf49830a2d911d9dd73b2718 +WARNING: Pushing hg changeset 78b79c32a5ebd9465e52e62a89d8bcc1195fcd40 for 4ed97a165e3f0d1ca757b002f27f2cd8950e912e +WARNING: Pushing hg changeset 28b847a8048277fe5bdbd0a5c6e0797999a2162e for 1abfec38590885e4a17cafbe02e3d7bae4fedddf +WARNING: Pushing hg changeset 39dc76886d9d0833328d6181007f4240d4b0d696 for ab71217466065bdd197ec69dd879ebbf191a9d1b +WARNING: Pushing hg changeset d63fae6e1adf45ea3a97d6c202a0bc37a52308bc for ecfe1d1fc4471e883da31ded2acf497ed72d2e69 +WARNING: Pushing hg changeset 9190666e9e546a633547e6ce17df208ccf532db1 for c5ae5f29c4995d3746bd67e4a875a58ae4424e3e To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..b7bcb05 master -> master -WARNING: Pushing hg changeset 6122d55e0f5dda25564fdce5d5f4820aa14e6c03 for cc271dda2604279b12c66cfb563e9f3e1e475e6d -WARNING: Pushing hg changeset db0fdf108108ae0634019b56b6825bb90fe39c4c for 8799d3009b1a55e17cf1648bb83c2c4a2a1e6178 -WARNING: Pushing hg changeset 2cbf923693952aade327616d29deff9fa0f0fd62 for 8a55050f5d599619845df726be69a5ea556df63b -WARNING: Pushing hg changeset e65bf39aeea76f5ea283a3c54bdf80abea5ab524 for a52aa72cf6d3043b0b78d37c4f821d4b42d9ae53 -WARNING: Pushing hg changeset 623bf252fad15d6f71e4d13eea7f47b212e49bc2 for b7bcb05158565b27bf49830a2d911d9dd73b2718 + fffffff..c5ae5f2 master -> master +WARNING: Pushing hg changeset 78b79c32a5ebd9465e52e62a89d8bcc1195fcd40 for 4ed97a165e3f0d1ca757b002f27f2cd8950e912e +WARNING: Pushing hg changeset 28b847a8048277fe5bdbd0a5c6e0797999a2162e for 1abfec38590885e4a17cafbe02e3d7bae4fedddf +WARNING: Pushing hg changeset 39dc76886d9d0833328d6181007f4240d4b0d696 for ab71217466065bdd197ec69dd879ebbf191a9d1b +WARNING: Pushing hg changeset d63fae6e1adf45ea3a97d6c202a0bc37a52308bc for ecfe1d1fc4471e883da31ded2acf497ed72d2e69 +WARNING: Pushing hg changeset 9190666e9e546a633547e6ce17df208ccf532db1 for c5ae5f29c4995d3746bd67e4a875a58ae4424e3e ok 46 - check-hg-commits with push mode - no local proxy expecting success: @@ -6860,7 +6878,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets cf96a38d9154 +new changesets 62bfb2a516b6 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -6880,32 +6898,32 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets 6b0a3bd63524:7ceeca99aad2 +new changesets 9b4319a01799:55a008bfcf1a progress revision 1 'default' (0/5) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - c709f98..1ea0236 master -> origin/master - c709f98..1ea0236 branches/default -> origin/branches/default -HEAD is now at 1ea0236 restored + 6d19ede..72cbc0e master -> origin/master + 6d19ede..72cbc0e branches/default -> origin/branches/default +HEAD is now at 72cbc0e restored /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] no changes found -WARNING: Using hg changeset 6b0a3bd63524ae27291081fe72bbde74be5dfe45 for 222f90072da03c14aa1f0199d8a05466dfaa791f -WARNING: Using hg changeset f25d9412a88ec2944c350192433cedeea8457a38 for df48581f643dbca9816988925572bcb538e39745 -WARNING: Using hg changeset d10d46045101db5349df44541da4550addf46655 for 1678aad2ec835d18018453afdc3302d7e49dea16 -WARNING: Using hg changeset cfbf8f7ebbec5d8e7b4a4d447c80b30218da07aa for f3d2d37439caeafc4db85bbeceea43328e8a9d5f -WARNING: Using hg changeset 7ceeca99aad2926647ed1b70fd3033a1169ca527 for 1ea023678e245d02091b278c9138f9c0ac24f1e0 +WARNING: Using hg changeset 9b4319a01799b94380a70744085f27c34a34d292 for d8a8a2769f120bd9f25945978f5ba50ef0c94c46 +WARNING: Using hg changeset 3871c733ad5901ff1e3f699dc771b685fe016b76 for 452eb06c88cd89b82f4e29f2eb37fe17e8ba4a21 +WARNING: Using hg changeset 0f49d686fea44b54518e311edf617ad7a175ed76 for e7a2967bfe694df8dae0ff2b1aabed6267440a78 +WARNING: Using hg changeset ffd7553e5cd611476bfd79189bf556d6687dd9b8 for 70138875439c7839f0ad579b63c63dee3888234b +WARNING: Using hg changeset 55a008bfcf1a426fe2140609e971a024e4626ee1 for 72cbc0e044ff1bbe0a96ad41900488dae6217824 searching for changes adding changesets adding manifests adding file changes added 5 changesets with 5 changes to 2 files To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..1ea0236 master -> master -WARNING: Using hg changeset 6b0a3bd63524ae27291081fe72bbde74be5dfe45 for 222f90072da03c14aa1f0199d8a05466dfaa791f -WARNING: Using hg changeset f25d9412a88ec2944c350192433cedeea8457a38 for df48581f643dbca9816988925572bcb538e39745 -WARNING: Using hg changeset d10d46045101db5349df44541da4550addf46655 for 1678aad2ec835d18018453afdc3302d7e49dea16 -WARNING: Using hg changeset cfbf8f7ebbec5d8e7b4a4d447c80b30218da07aa for f3d2d37439caeafc4db85bbeceea43328e8a9d5f -WARNING: Using hg changeset 7ceeca99aad2926647ed1b70fd3033a1169ca527 for 1ea023678e245d02091b278c9138f9c0ac24f1e0 + fffffff..72cbc0e master -> master +WARNING: Using hg changeset 9b4319a01799b94380a70744085f27c34a34d292 for d8a8a2769f120bd9f25945978f5ba50ef0c94c46 +WARNING: Using hg changeset 3871c733ad5901ff1e3f699dc771b685fe016b76 for 452eb06c88cd89b82f4e29f2eb37fe17e8ba4a21 +WARNING: Using hg changeset 0f49d686fea44b54518e311edf617ad7a175ed76 for e7a2967bfe694df8dae0ff2b1aabed6267440a78 +WARNING: Using hg changeset ffd7553e5cd611476bfd79189bf556d6687dd9b8 for 70138875439c7839f0ad579b63c63dee3888234b +WARNING: Using hg changeset 55a008bfcf1a426fe2140609e971a024e4626ee1 for 72cbc0e044ff1bbe0a96ad41900488dae6217824 ok 47 - check-hg-commits with push mode - with local proxy expecting success: @@ -6927,7 +6945,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets e72b4e56e160 +new changesets 463ae4063cba progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead @@ -6937,23 +6955,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 May 16 10:08 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:07 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 May 16 10:08 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 May 16 10:08 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:07 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Apr 14 03:51 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Apr 14 03:51 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Apr 14 03:51 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:07 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 May 16 10:07 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:07 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Apr 14 03:51 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 May 16 10:08 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Apr 14 03:51 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 refs ok 48 - shared-marks unset expecting success: @@ -6985,7 +7003,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 90c7561414c9 +new changesets 53ac0b552eed progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead @@ -6995,23 +7013,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 May 16 10:08 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 May 16 10:08 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 May 16 10:08 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Apr 14 03:51 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Apr 14 03:51 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Apr 14 03:51 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 May 16 10:08 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Apr 14 03:51 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 May 16 10:08 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Apr 14 03:51 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 refs /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: seeded marks of second with shared; performing gc @@ -7033,25 +7051,25 @@ progress revision walk 'branches/default' (0/0) progress revision 0 'default' (0/1) total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 May 16 10:08 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 May 16 10:08 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 May 16 10:08 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 May 16 10:08 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Apr 14 03:51 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Apr 14 03:51 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Apr 14 03:51 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Apr 14 03:51 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 May 16 10:08 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 May 16 10:08 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 May 16 10:08 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 May 16 10:08 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 May 16 10:08 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Apr 14 03:51 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Apr 14 03:51 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Apr 14 03:51 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Apr 14 03:51 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Apr 14 03:51 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 May 16 10:08 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 May 16 10:08 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 May 16 10:08 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 May 16 10:08 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 May 16 10:08 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Apr 14 03:51 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Apr 14 03:51 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Apr 14 03:51 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Apr 14 03:51 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Apr 14 03:51 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 refs ok 49 - shared-marks set to unset expecting success: @@ -7092,7 +7110,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 2355d94bb958 +new changesets 77c9bb202234 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead @@ -7104,70 +7122,70 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 May 16 10:08 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 May 16 10:08 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 May 16 10:08 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 May 16 10:08 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Apr 14 03:51 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Apr 14 03:51 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Apr 14 03:51 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Apr 14 03:51 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 May 16 10:08 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 May 16 10:08 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 May 16 10:08 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 May 16 10:08 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 May 16 10:08 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Apr 14 03:51 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Apr 14 03:51 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Apr 14 03:51 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Apr 14 03:51 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Apr 14 03:51 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 May 16 10:08 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 May 16 10:08 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 May 16 10:08 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 May 16 10:08 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 May 16 10:08 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Apr 14 03:51 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Apr 14 03:51 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Apr 14 03:51 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Apr 14 03:51 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Apr 14 03:51 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 refs /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] no changes found total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 May 16 10:08 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 May 16 10:08 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 May 16 10:08 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 May 16 10:08 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Apr 14 03:51 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Apr 14 03:51 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Apr 14 03:51 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Apr 14 03:51 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 May 16 10:08 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 May 16 10:08 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 May 16 10:08 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 May 16 10:08 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 May 16 10:08 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Apr 14 03:51 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Apr 14 03:51 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Apr 14 03:51 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Apr 14 03:51 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Apr 14 03:51 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 May 16 10:08 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 May 16 10:08 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 May 16 10:08 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 May 16 10:08 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 May 16 10:08 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Apr 14 03:51 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Apr 14 03:51 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Apr 14 03:51 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Apr 14 03:51 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Apr 14 03:51 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 refs /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: using marks of remote origin as shared marks no changes found total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 May 16 10:08 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 May 16 10:08 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 May 16 10:08 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Apr 14 03:51 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Apr 14 03:51 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Apr 14 03:51 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 May 16 10:08 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Apr 14 03:51 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 May 16 10:08 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 May 16 10:08 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 May 16 10:08 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Apr 14 03:51 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Apr 14 03:51 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Apr 14 03:51 refs ok 50 - shared-marks unset to set expecting success: @@ -7216,7 +7234,7 @@ To hg::../hgrepo * [new branch] master -> master 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Access: (0777/-rwxrwxrwx) Uid: ( 1111/pbuilder1) Gid: ( 1111/pbuilder1) +Access: (0777/-rwxrwxrwx) Uid: ( 2222/pbuilder2) Gid: ( 2222/pbuilder2) ok 51 - push with renamed executable preserves executable bit expecting success: @@ -7339,12 +7357,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: including full source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/7780/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/7780/tmp/hooks/B01_cleanup finished I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: cleaning the build env -I: removing directory /srv/workspace/pbuilder/30658 and its subdirectories -I: Current time: Wed May 15 22:08:20 -12 2024 -I: pbuilder-time-stamp: 1715854100 +I: removing directory /srv/workspace/pbuilder/7780 and its subdirectories +I: Current time: Fri Apr 14 17:51:37 +14 2023 +I: pbuilder-time-stamp: 1681444297