Diff of the two buildlogs: -- --- b1/build.log 2023-06-02 01:11:47.716395185 +0000 +++ b2/build.log 2023-06-02 01:14:59.959975410 +0000 @@ -1,8 +1,49 @@ I: pbuilder: network access will be disabled during build -I: Current time: Thu Jun 1 12:55:55 -12 2023 -I: pbuilder-time-stamp: 1685667355 +I: Current time: Thu Jul 4 21:34:49 +14 2024 +I: pbuilder-time-stamp: 1720078489 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/bookworm-reproducible-base.tgz] +tar: ./usr/share/perl5/Debian: time stamp 2025-08-05 10:27:04 is 34260732.961592022 s in the future +tar: ./usr/share/man/pt/man8: time stamp 2025-08-05 10:27:04 is 34260732.929300876 s in the future +tar: ./usr/share/man/pt/man5: time stamp 2025-08-05 10:27:04 is 34260732.928132775 s in the future +tar: ./usr/share/man/nl/man8: time stamp 2025-08-05 10:27:04 is 34260732.925636999 s in the future +tar: ./usr/share/man/nl/man5: time stamp 2025-08-05 10:27:04 is 34260732.924472045 s in the future +tar: ./usr/share/man/man5: time stamp 2025-08-05 10:27:04 is 34260732.917368382 s in the future +tar: ./usr/share/man/fr/man5: time stamp 2025-08-05 10:27:04 is 34260732.91258043 s in the future +tar: ./usr/share/man/de/man5: time stamp 2025-08-05 10:27:04 is 34260732.907565287 s in the future +tar: ./usr/share/locale/zh_CN/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.724708823 s in the future +tar: ./usr/share/locale/vi/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.708767883 s in the future +tar: ./usr/share/locale/uk/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.681791555 s in the future +tar: ./usr/share/locale/sv/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.659316019 s in the future +tar: ./usr/share/locale/sk/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.651936888 s in the future +tar: ./usr/share/locale/ru/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.62555685 s in the future +tar: ./usr/share/locale/pt_BR/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.613377735 s in the future +tar: ./usr/share/locale/pt/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.595933455 s in the future +tar: ./usr/share/locale/pl/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.58350432 s in the future +tar: ./usr/share/locale/nl/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.569143487 s in the future +tar: ./usr/share/locale/nb/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.559775393 s in the future +tar: ./usr/share/locale/ko/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.550457088 s in the future +tar: ./usr/share/locale/ja/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.535593175 s in the future +tar: ./usr/share/locale/it/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.524095729 s in the future +tar: ./usr/share/locale/hu/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.51543715 s in the future +tar: ./usr/share/locale/gl/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.510770382 s in the future +tar: ./usr/share/locale/fr/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.484081058 s in the future +tar: ./usr/share/locale/eu/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.480599413 s in the future +tar: ./usr/share/locale/es/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.4595163 s in the future +tar: ./usr/share/locale/de/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.444777771 s in the future +tar: ./usr/share/locale/da/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.431734683 s in the future +tar: ./usr/share/locale/cs/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.41842312 s in the future +tar: ./usr/share/locale/ca/LC_MESSAGES: time stamp 2025-08-05 10:27:04 is 34260732.405430113 s in the future +tar: ./usr/share/doc/adduser/examples/adduser.local.conf.examples/skel.other: time stamp 2025-08-05 10:27:04 is 34260732.292900415 s in the future +tar: ./usr/share/doc/adduser/examples/adduser.local.conf.examples/skel: time stamp 2025-08-05 10:27:04 is 34260732.292759873 s in the future +tar: ./usr/share/doc/adduser/examples/adduser.local.conf.examples: time stamp 2025-08-05 10:27:04 is 34260732.292665234 s in the future +tar: ./usr/share/doc/adduser/examples: time stamp 2025-08-05 10:27:04 is 34260732.292212721 s in the future +tar: ./usr/share/doc/adduser: time stamp 2025-08-05 10:27:04 is 34260732.292036705 s in the future +tar: ./var/lib/dpkg/info/adduser.list: time stamp 2025-08-05 10:27:04 is 34260728.405280117 s in the future +tar: ./usr/share/man/de/man8: time stamp 2025-08-05 10:27:04 is 34260727.939200635 s in the future +tar: ./usr/share/man/fr/man8: time stamp 2025-08-05 10:27:04 is 34260727.939083735 s in the future +tar: ./usr/share/man/man8: time stamp 2025-08-05 10:27:04 is 34260727.938997667 s in the future +tar: ./usr/sbin: time stamp 2025-08-05 10:27:04 is 34260727.937771317 s in the future I: copying local configuration W: --override-config is not set; not updating apt.conf Read the manpage for details. I: mounting /proc filesystem @@ -16,7 +57,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,135 +68,167 @@ 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/2383504/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/3875776/tmp/hooks/D01_modify_environment starting +debug: Running on ionos15-amd64. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +'/bin/sh' -> '/bin/bash' +lrwxrwxrwx 1 root root 9 Jul 4 21:34 /bin/sh -> /bin/bash +I: Setting pbuilder2's login shell to /bin/bash +I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other +I: user script /srv/workspace/pbuilder/3875776/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/3875776/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' - BUILD_ARCH='amd64' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=15 ' - DISTRIBUTION='bookworm' - HOME='/root' - HOST_ARCH='amd64' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="2" [2]="15" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu") + BASH_VERSION='5.2.15(1)-release' + BUILDDIR=/build + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=amd64 + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=16 ' + DIRSTACK=() + DISTRIBUTION=bookworm + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=x86_64 + HOST_ARCH=amd64 IFS=' ' - INVOCATION_ID='7d472a427d31479a967daea4bed9e55c' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - MAIL='/var/mail/root' - OPTIND='1' - PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' - PBCURRENTCOMMANDLINEOPERATION='build' - PBUILDER_OPERATION='build' - PBUILDER_PKGDATADIR='/usr/share/pbuilder' - PBUILDER_PKGLIBDIR='/usr/lib/pbuilder' - PBUILDER_SYSCONFDIR='/etc' - PPID='2383504' - PS1='# ' - PS2='> ' + INVOCATION_ID=896005ee7a7a4f4c9121af494ff078c9 + LANG=C + LANGUAGE=et_EE:et + LC_ALL=C + MACHTYPE=x86_64-pc-linux-gnu + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnu + PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path + PBCURRENTCOMMANDLINEOPERATION=build + PBUILDER_OPERATION=build + PBUILDER_PKGDATADIR=/usr/share/pbuilder + PBUILDER_PKGLIBDIR=/usr/lib/pbuilder + PBUILDER_SYSCONFDIR=/etc + PIPESTATUS=([0]="0") + POSIXLY_CORRECT=y + PPID=3875776 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.XbU4jdWT/pbuilderrc_zV9q --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.XbU4jdWT/b1 --logfile b1/build.log git-remote-hg_1.0.4~ds-1.dsc' - SUDO_GID='110' - SUDO_UID='105' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://78.137.99.97:3128' + PWD=/ + SHELL=/bin/bash + SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix + SHLVL=3 + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.XbU4jdWT/pbuilderrc_UZfT --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.XbU4jdWT/b2 --logfile b2/build.log --extrapackages usrmerge git-remote-hg_1.0.4~ds-1.dsc' + SUDO_GID=111 + SUDO_UID=106 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://85.184.249.68:3128 I: uname -a - Linux ionos1-amd64 5.10.0-23-amd64 #1 SMP Debian 5.10.179-1 (2023-05-12) x86_64 GNU/Linux + Linux i-capture-the-hostname 6.1.0-0.deb11.7-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.20-2~bpo11+1 (2023-04-23) x86_64 GNU/Linux I: ls -l /bin total 5632 - -rwxr-xr-x 1 root root 1265648 Apr 23 09:23 bash - -rwxr-xr-x 3 root root 39224 Sep 18 2022 bunzip2 - -rwxr-xr-x 3 root root 39224 Sep 18 2022 bzcat - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzcmp -> bzdiff - -rwxr-xr-x 1 root root 2225 Sep 18 2022 bzdiff - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzegrep -> bzgrep - -rwxr-xr-x 1 root root 4893 Nov 27 2021 bzexe - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzfgrep -> bzgrep - -rwxr-xr-x 1 root root 3775 Sep 18 2022 bzgrep - -rwxr-xr-x 3 root root 39224 Sep 18 2022 bzip2 - -rwxr-xr-x 1 root root 14568 Sep 18 2022 bzip2recover - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzless -> bzmore - -rwxr-xr-x 1 root root 1297 Sep 18 2022 bzmore - -rwxr-xr-x 1 root root 44016 Sep 20 2022 cat - -rwxr-xr-x 1 root root 68656 Sep 20 2022 chgrp - -rwxr-xr-x 1 root root 64496 Sep 20 2022 chmod - -rwxr-xr-x 1 root root 72752 Sep 20 2022 chown - -rwxr-xr-x 1 root root 151152 Sep 20 2022 cp - -rwxr-xr-x 1 root root 125640 Jan 5 01:20 dash - -rwxr-xr-x 1 root root 121904 Sep 20 2022 date - -rwxr-xr-x 1 root root 89240 Sep 20 2022 dd - -rwxr-xr-x 1 root root 102200 Sep 20 2022 df - -rwxr-xr-x 1 root root 151344 Sep 20 2022 dir - -rwxr-xr-x 1 root root 88656 Mar 22 22:02 dmesg - lrwxrwxrwx 1 root root 8 Dec 19 01:33 dnsdomainname -> hostname - lrwxrwxrwx 1 root root 8 Dec 19 01:33 domainname -> hostname - -rwxr-xr-x 1 root root 43856 Sep 20 2022 echo - -rwxr-xr-x 1 root root 41 Jan 24 02:43 egrep - -rwxr-xr-x 1 root root 35664 Sep 20 2022 false - -rwxr-xr-x 1 root root 41 Jan 24 02:43 fgrep - -rwxr-xr-x 1 root root 85600 Mar 22 22:02 findmnt - -rwsr-xr-x 1 root root 35128 Mar 22 20:35 fusermount - -rwxr-xr-x 1 root root 203152 Jan 24 02:43 grep - -rwxr-xr-x 2 root root 2346 Apr 9 2022 gunzip - -rwxr-xr-x 1 root root 6447 Apr 9 2022 gzexe - -rwxr-xr-x 1 root root 98136 Apr 9 2022 gzip - -rwxr-xr-x 1 root root 22680 Dec 19 01:33 hostname - -rwxr-xr-x 1 root root 72824 Sep 20 2022 ln - -rwxr-xr-x 1 root root 53024 Mar 23 00:40 login - -rwxr-xr-x 1 root root 151344 Sep 20 2022 ls - -rwxr-xr-x 1 root root 207168 Mar 22 22:02 lsblk - -rwxr-xr-x 1 root root 97552 Sep 20 2022 mkdir - -rwxr-xr-x 1 root root 72912 Sep 20 2022 mknod - -rwxr-xr-x 1 root root 43952 Sep 20 2022 mktemp - -rwxr-xr-x 1 root root 59712 Mar 22 22:02 more - -rwsr-xr-x 1 root root 59704 Mar 22 22:02 mount - -rwxr-xr-x 1 root root 18744 Mar 22 22:02 mountpoint - -rwxr-xr-x 1 root root 142968 Sep 20 2022 mv - lrwxrwxrwx 1 root root 8 Dec 19 01:33 nisdomainname -> hostname - lrwxrwxrwx 1 root root 14 Apr 2 18:25 pidof -> /sbin/killall5 - -rwxr-xr-x 1 root root 43952 Sep 20 2022 pwd - lrwxrwxrwx 1 root root 4 Apr 23 09:23 rbash -> bash - -rwxr-xr-x 1 root root 52112 Sep 20 2022 readlink - -rwxr-xr-x 1 root root 72752 Sep 20 2022 rm - -rwxr-xr-x 1 root root 56240 Sep 20 2022 rmdir - -rwxr-xr-x 1 root root 27560 Nov 2 2022 run-parts - -rwxr-xr-x 1 root root 126424 Jan 5 07:55 sed - lrwxrwxrwx 1 root root 4 Jan 5 01:20 sh -> dash - -rwxr-xr-x 1 root root 43888 Sep 20 2022 sleep - -rwxr-xr-x 1 root root 85008 Sep 20 2022 stty - -rwsr-xr-x 1 root root 72000 Mar 22 22:02 su - -rwxr-xr-x 1 root root 39824 Sep 20 2022 sync - -rwxr-xr-x 1 root root 531984 Apr 6 02:25 tar - -rwxr-xr-x 1 root root 14520 Nov 2 2022 tempfile - -rwxr-xr-x 1 root root 109616 Sep 20 2022 touch - -rwxr-xr-x 1 root root 35664 Sep 20 2022 true - -rwxr-xr-x 1 root root 14568 Mar 22 20:35 ulockmgr_server - -rwsr-xr-x 1 root root 35128 Mar 22 22:02 umount - -rwxr-xr-x 1 root root 43888 Sep 20 2022 uname - -rwxr-xr-x 2 root root 2346 Apr 9 2022 uncompress - -rwxr-xr-x 1 root root 151344 Sep 20 2022 vdir - -rwxr-xr-x 1 root root 72024 Mar 22 22:02 wdctl - lrwxrwxrwx 1 root root 8 Dec 19 01:33 ypdomainname -> hostname - -rwxr-xr-x 1 root root 1984 Apr 9 2022 zcat - -rwxr-xr-x 1 root root 1678 Apr 9 2022 zcmp - -rwxr-xr-x 1 root root 6460 Apr 9 2022 zdiff - -rwxr-xr-x 1 root root 29 Apr 9 2022 zegrep - -rwxr-xr-x 1 root root 29 Apr 9 2022 zfgrep - -rwxr-xr-x 1 root root 2081 Apr 9 2022 zforce - -rwxr-xr-x 1 root root 8103 Apr 9 2022 zgrep - -rwxr-xr-x 1 root root 2206 Apr 9 2022 zless - -rwxr-xr-x 1 root root 1842 Apr 9 2022 zmore - -rwxr-xr-x 1 root root 4577 Apr 9 2022 znew -I: user script /srv/workspace/pbuilder/2383504/tmp/hooks/D02_print_environment finished + -rwxr-xr-x 1 root root 1265648 Apr 24 2023 bash + -rwxr-xr-x 3 root root 39224 Sep 19 2022 bunzip2 + -rwxr-xr-x 3 root root 39224 Sep 19 2022 bzcat + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzcmp -> bzdiff + -rwxr-xr-x 1 root root 2225 Sep 19 2022 bzdiff + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzegrep -> bzgrep + -rwxr-xr-x 1 root root 4893 Nov 28 2021 bzexe + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzfgrep -> bzgrep + -rwxr-xr-x 1 root root 3775 Sep 19 2022 bzgrep + -rwxr-xr-x 3 root root 39224 Sep 19 2022 bzip2 + -rwxr-xr-x 1 root root 14568 Sep 19 2022 bzip2recover + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzless -> bzmore + -rwxr-xr-x 1 root root 1297 Sep 19 2022 bzmore + -rwxr-xr-x 1 root root 44016 Sep 21 2022 cat + -rwxr-xr-x 1 root root 68656 Sep 21 2022 chgrp + -rwxr-xr-x 1 root root 64496 Sep 21 2022 chmod + -rwxr-xr-x 1 root root 72752 Sep 21 2022 chown + -rwxr-xr-x 1 root root 151152 Sep 21 2022 cp + -rwxr-xr-x 1 root root 125640 Jan 6 2023 dash + -rwxr-xr-x 1 root root 121904 Sep 21 2022 date + -rwxr-xr-x 1 root root 89240 Sep 21 2022 dd + -rwxr-xr-x 1 root root 102200 Sep 21 2022 df + -rwxr-xr-x 1 root root 151344 Sep 21 2022 dir + -rwxr-xr-x 1 root root 88656 Mar 24 2023 dmesg + lrwxrwxrwx 1 root root 8 Dec 20 2022 dnsdomainname -> hostname + lrwxrwxrwx 1 root root 8 Dec 20 2022 domainname -> hostname + -rwxr-xr-x 1 root root 43856 Sep 21 2022 echo + -rwxr-xr-x 1 root root 41 Jan 25 2023 egrep + -rwxr-xr-x 1 root root 35664 Sep 21 2022 false + -rwxr-xr-x 1 root root 41 Jan 25 2023 fgrep + -rwxr-xr-x 1 root root 85600 Mar 24 2023 findmnt + -rwsr-xr-x 1 root root 35128 Mar 23 2023 fusermount + -rwxr-xr-x 1 root root 203152 Jan 25 2023 grep + -rwxr-xr-x 2 root root 2346 Apr 10 2022 gunzip + -rwxr-xr-x 1 root root 6447 Apr 10 2022 gzexe + -rwxr-xr-x 1 root root 98136 Apr 10 2022 gzip + -rwxr-xr-x 1 root root 22680 Dec 20 2022 hostname + -rwxr-xr-x 1 root root 72824 Sep 21 2022 ln + -rwxr-xr-x 1 root root 53024 Mar 24 2023 login + -rwxr-xr-x 1 root root 151344 Sep 21 2022 ls + -rwxr-xr-x 1 root root 207168 Mar 24 2023 lsblk + -rwxr-xr-x 1 root root 97552 Sep 21 2022 mkdir + -rwxr-xr-x 1 root root 72912 Sep 21 2022 mknod + -rwxr-xr-x 1 root root 43952 Sep 21 2022 mktemp + -rwxr-xr-x 1 root root 59712 Mar 24 2023 more + -rwsr-xr-x 1 root root 59704 Mar 24 2023 mount + -rwxr-xr-x 1 root root 18744 Mar 24 2023 mountpoint + -rwxr-xr-x 1 root root 142968 Sep 21 2022 mv + lrwxrwxrwx 1 root root 8 Dec 20 2022 nisdomainname -> hostname + lrwxrwxrwx 1 root root 14 Apr 3 2023 pidof -> /sbin/killall5 + -rwxr-xr-x 1 root root 43952 Sep 21 2022 pwd + lrwxrwxrwx 1 root root 4 Apr 24 2023 rbash -> bash + -rwxr-xr-x 1 root root 52112 Sep 21 2022 readlink + -rwxr-xr-x 1 root root 72752 Sep 21 2022 rm + -rwxr-xr-x 1 root root 56240 Sep 21 2022 rmdir + -rwxr-xr-x 1 root root 27560 Nov 3 2022 run-parts + -rwxr-xr-x 1 root root 126424 Jan 6 2023 sed + lrwxrwxrwx 1 root root 9 Jul 4 21:34 sh -> /bin/bash + -rwxr-xr-x 1 root root 43888 Sep 21 2022 sleep + -rwxr-xr-x 1 root root 85008 Sep 21 2022 stty + -rwsr-xr-x 1 root root 72000 Mar 24 2023 su + -rwxr-xr-x 1 root root 39824 Sep 21 2022 sync + -rwxr-xr-x 1 root root 531984 Apr 7 2023 tar + -rwxr-xr-x 1 root root 14520 Nov 3 2022 tempfile + -rwxr-xr-x 1 root root 109616 Sep 21 2022 touch + -rwxr-xr-x 1 root root 35664 Sep 21 2022 true + -rwxr-xr-x 1 root root 14568 Mar 23 2023 ulockmgr_server + -rwsr-xr-x 1 root root 35128 Mar 24 2023 umount + -rwxr-xr-x 1 root root 43888 Sep 21 2022 uname + -rwxr-xr-x 2 root root 2346 Apr 10 2022 uncompress + -rwxr-xr-x 1 root root 151344 Sep 21 2022 vdir + -rwxr-xr-x 1 root root 72024 Mar 24 2023 wdctl + lrwxrwxrwx 1 root root 8 Dec 20 2022 ypdomainname -> hostname + -rwxr-xr-x 1 root root 1984 Apr 10 2022 zcat + -rwxr-xr-x 1 root root 1678 Apr 10 2022 zcmp + -rwxr-xr-x 1 root root 6460 Apr 10 2022 zdiff + -rwxr-xr-x 1 root root 29 Apr 10 2022 zegrep + -rwxr-xr-x 1 root root 29 Apr 10 2022 zfgrep + -rwxr-xr-x 1 root root 2081 Apr 10 2022 zforce + -rwxr-xr-x 1 root root 8103 Apr 10 2022 zgrep + -rwxr-xr-x 1 root root 2206 Apr 10 2022 zless + -rwxr-xr-x 1 root root 1842 Apr 10 2022 zmore + -rwxr-xr-x 1 root root 4577 Apr 10 2022 znew +I: user script /srv/workspace/pbuilder/3875776/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -283,7 +356,7 @@ Get: 74 http://deb.debian.org/debian bookworm/main amd64 mercurial-git all 1.0.1-1 [62.1 kB] Get: 75 http://deb.debian.org/debian bookworm/main amd64 sharness all 1.0.0-1.1 [28.6 kB] Get: 76 http://deb.debian.org/debian bookworm/main amd64 xmlto amd64 0.0.28-2.1 [33.6 kB] -Fetched 41.2 MB in 2s (23.3 MB/s) +Fetched 41.2 MB in 1s (67.2 MB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libpython3.11-minimal:amd64. (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 ... 19591 files and directories currently installed.) @@ -611,8 +684,19 @@ 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/3875776/tmp/hooks/A99_set_merged_usr starting +Re-configuring usrmerge... +removed '/etc/unsupported-skip-usrmerge-conversion' +The system has been successfully converted. +I: user script /srv/workspace/pbuilder/3875776/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +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 @@ -622,7 +706,7 @@ debian/rules clean dh clean dh_auto_clean - make -j15 clean + make -j16 clean make[1]: Entering directory '/build/git-remote-hg-1.0.4~ds' rm -f doc/git-remote-hg.1 rm -f -r bin/ @@ -634,7 +718,7 @@ dh_autoreconf dh_auto_configure dh_auto_build - make -j15 "INSTALL=install --strip-program=true" + make -j16 "INSTALL=install --strip-program=true" make[1]: Entering directory '/build/git-remote-hg-1.0.4~ds' if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then \ : Use chosen Python version ; \ @@ -658,7 +742,7 @@ a2x -d manpage -f manpage doc/git-remote-hg.txt make[1]: Leaving directory '/build/git-remote-hg-1.0.4~ds' dh_auto_test - make -j15 test + make -j16 test make[1]: Entering directory '/build/git-remote-hg-1.0.4~ds' make -C test make[2]: Entering directory '/build/git-remote-hg-1.0.4~ds/test' @@ -667,15 +751,6 @@ /bin/sh bidi.t --verbose /bin/sh helper.t --verbose expecting success: - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - ) - -expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && setup_repos && @@ -688,15 +763,6 @@ grep origin help expecting success: - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - ) - -expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && ( @@ -732,6 +798,24 @@ test_cmp expected actual +expecting success: + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) + +expecting success: + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) + [master (root-commit) 79c6ce2] add älphà Author: A U Thor 1 file changed, 1 insertion(+) @@ -750,6 +834,12 @@ create mode 100644 delta /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 4 changesets with 4 changes to 4 files ok 1 - setup expecting success: @@ -758,13 +848,6 @@ check gitrepo HEAD zero Cloning into 'gitrepo'... -no changes found -Cloning into 'gitrepo'... -searching for changes -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 4 files ok 1 - setup expecting success: @@ -773,24 +856,34 @@ check gitrepo HEAD zero 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] +/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 added 1 changesets with 1 changes to 1 files -new changesets 883efc3462b6 +new changesets d3dd4c4e2f6a 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 883efc3462b6 +new changesets d3dd4c4e2f6a +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 d3dd4c4e2f6a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 2 - cloning @@ -808,19 +901,34 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/branches/next next -/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 +ok 2 - cloning + +expecting success: + test_when_finished "rm -rf gitrepo*" && + + ( + cd hgrepo && + hg branch next && + echo next > content && + hg commit -m next + ) && + + git clone "hg::hgrepo" gitrepo && + check gitrepo origin/branches/next next + +/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 7e0de2f0471a -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 4 changesets with 4 changes to 4 files +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?) -/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] origin ok 1 - subcommand help @@ -841,47 +949,37 @@ test_cmp expected actual -ok 2 - cloning - -expecting success: - test_when_finished "rm -rf gitrepo*" && - - ( - cd hgrepo && - hg branch next && - echo next > content && - hg commit -m next - ) && - - git clone "hg::hgrepo" gitrepo && - check gitrepo origin/branches/next next - +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] +/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 4 changesets with 4 changes to 4 files -new changesets 1e3e49d2cc8f:6674f1c866b5 -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/4) -Cloning into 'gitrepo'... -marked working directory as branch next -(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 d3dd4c4e2f6a:0b842c63cda6 /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'... +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 883efc3462b6:376a89fe8148 +new changesets d3dd4c4e2f6a:0b842c63cda6 progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'next' (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'... ok 3 - cloning with branches expecting success: @@ -898,26 +996,9 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/feature-a feature-a -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 -/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 7e0de2f0471a:2f2606b0397f -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) 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] +Cloning into 'gitrepo'... ok 3 - cloning with branches expecting success: @@ -934,29 +1015,12 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/feature-a feature-a -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Cloning into 'gitrepo'... -/build/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] -ok 2 - subcommand repo - no local proxy - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repos && - - ( - cd gitrepo && - export gitdir=`git rev-parse --git-dir` - # trick to normalize path - ( cd $gitdir/hg/origin/clone && pwd ) >../expected && - ( cd `git-hg-helper repo origin` && pwd ) > ../actual - ) && - - test_cmp expected actual - +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 1 - encoding expecting success: @@ -994,6 +1058,8 @@ Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha +/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 862befc] add beta Author: A U Thor 1 file changed, 1 insertion(+) @@ -1003,7 +1069,6 @@ 1 file changed, 1 insertion(+) create mode 100644 foo/bar rm 'alpha' -Cloning into 'gitrepo'... [master 74dc957] remove alpha Author: A U Thor 1 file changed, 1 deletion(-) @@ -1013,19 +1078,43 @@ 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.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +ok 2 - subcommand repo - no local proxy + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repos && + + ( + cd gitrepo && + export gitdir=`git rev-parse --git-dir` + # trick to normalize path + ( cd $gitdir/hg/origin/clone && pwd ) >../expected && + ( cd `git-hg-helper repo origin` && pwd ) > ../actual + ) && + + test_cmp expected actual + +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] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 883efc3462b6:1c40b2a45abe +new changesets d3dd4c4e2f6a:118de367ad07 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.bidi/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 ok 4 - cloning with bookmarks expecting success: @@ -1047,18 +1136,20 @@ check_bookmark hgrepo devel devel -/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 5 changesets with 3 changes to 3 files 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 7e0de2f0471a:1f051305431f +new changesets d3dd4c4e2f6a:961e95efc598 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) -Cloning into 'gitrepo'... ok 4 - cloning with bookmarks expecting success: @@ -1081,69 +1172,58 @@ check_bookmark hgrepo devel devel 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 +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] +/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 5 changesets with 3 changes to 3 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] -Cloning into 'gitrepo'... -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] +added 1 changesets with 1 changes to 1 files +new changesets b00ae28f4a75 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) adding changesets adding manifests adding file changes adding remote bookmark devel adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 883efc3462b6:1c40b2a45abe +new changesets d3dd4c4e2f6a:118de367ad07 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.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +[devel 1c3daf3] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets db8fefdc2c0a -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[devel 41cbea9] 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 +added 5 changesets with 3 changes to 3 files +new changesets 362b656574c3:54f595cbdf1f +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/5) +/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 adding remote bookmark devel adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 7e0de2f0471a:1f051305431f +new changesets d3dd4c4e2f6a:961e95efc598 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.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 -[devel efd3953] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files /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 +/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 3 - subcommand repo - with local proxy @@ -1161,21 +1241,34 @@ test_cmp rev-HEAD git-HEAD ) +[devel 3ddb35d] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +no changes found +searching for changes adding changesets adding manifests adding file changes -added 5 changesets with 3 changes to 3 files -new changesets 362b656574c3:54f595cbdf1f -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/5) -/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 +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 no changes found +/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 adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +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: @@ -1193,7 +1286,8 @@ 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 +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] ok 5 - update bookmark @@ -1211,49 +1305,22 @@ check_bookmark hgrepo feature-b feature-b -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 -/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 remote bookmark devel adding remote bookmark feature-a added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets 883efc3462b6:b5c9ce7599b9 +new changesets d3dd4c4e2f6a:da7071c40ac8 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/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 -[feature-b f26ee01] feature-b +[feature-b cd3de5e] feature-b 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.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 devel -adding remote bookmark feature-a -added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets 7e0de2f0471a:706f1be240c3 -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/3) -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] -[feature-b 155d014] feature-b - 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 @@ -1262,57 +1329,30 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 185cbb89a3de -no changes found -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -searching for changes +new changesets 3b705a4d331e adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +adding remote bookmark devel +adding remote bookmark feature-a +added 4 changesets with 4 changes to 1 files (+1 heads) +new changesets d3dd4c4e2f6a:e0a3bf7b1bf7 +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/3) +progress revision 1 'next' (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] +[feature-b 5624b1c] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -ok 6 - new bookmark - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && - - ( - hg init hgrepo && - cd hgrepo && - - touch content && - hg add content && - - > ../expected && - author_test alpha "" "H G Wells " && - author_test beta "beta" "beta " && - author_test gamma "gamma (comment)" "gamma " && - author_test delta "" "Unknown " && - author_test epsilon "epsilon" "epsilon " && - author_test zeta "zeta " && - author_test eta " eta " "eta " && - author_test theta "theta < test@example.com >" "theta " && - author_test iota "iota >test@example.com>" "iota " && - author_test kappa "kappa < test example com>" "kappa " && - author_test lambda "lambda@example.com" "Unknown " && - author_test mu "mu.mu@example.com" "Unknown " - ) && - - git clone "hg::hgrepo" gitrepo && - git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual && - - test_cmp expected actual - -/build/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 2 - file removal expecting success: @@ -1350,6 +1390,18 @@ Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 beta +/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 +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files ok 6 - new bookmark expecting success: @@ -1382,8 +1434,50 @@ test_cmp expected actual +/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-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +ok 6 - new bookmark + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + hg init hgrepo && + cd hgrepo && + + touch content && + hg add content && + + > ../expected && + author_test alpha "" "H G Wells " && + author_test beta "beta" "beta " && + author_test gamma "gamma (comment)" "gamma " && + author_test delta "" "Unknown " && + author_test epsilon "epsilon" "epsilon " && + author_test zeta "zeta " && + author_test eta " eta " "eta " && + author_test theta "theta < test@example.com >" "theta " && + author_test iota "iota >test@example.com>" "iota " && + author_test kappa "kappa < test example com>" "kappa " && + author_test lambda "lambda@example.com" "Unknown " && + author_test mu "mu.mu@example.com" "Unknown " + ) && + + git clone "hg::hgrepo" gitrepo && + git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual && + + test_cmp expected actual + +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 ok 4 - subcommands hg-rev and git-rev expecting success: @@ -1425,16 +1519,6 @@ /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 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.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes @@ -1447,22 +1531,22 @@ searching for changes no changes found searching for changes -Cloning into 'gitrepo'... adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files +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 4 changesets with 4 changes to 1 files -new changesets 7117a160a4dd:b05411248e1a +new changesets 90a495e346c7:3908401b1f2a progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/e70d1fecc379-0198b750-backup.hg +saved backup bundle to /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/2344f8d9510b-a12e9e6c-backup.hg ok 3 - git tags expecting success: @@ -1501,40 +1585,80 @@ test_cmp expected actual +/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] -Cloning into 'gitrepo'... +no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 85ec4dc08f43 -progress revision 4 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - + c9ffa64...5ed112f master -> origin/master (forced update) - + c9ffa64...5ed112f 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] -HEAD is now at 5ed112f four -no changes found searching for changes +new changesets b3e9ab1788b7 adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +progress revision 4 'default' (0/1) searching for 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 +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + + 37370fb...f48ef3d master -> origin/master (forced update) + + 37370fb...f48ef3d branches/default -> origin/branches/default (forced update) +HEAD is now at f48ef3d 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] +Cloning into 'gitrepo'... +Loading hg marks ... +Loading git marks ... +Performing garbage collection on git commits ... +Computing marks intersection ... +Including notes commits ... +Trimmed hg marks from #5 down to #0 +Trimmed git marks from #12 down to #2 +Writing hg marks ... +Writing git marks ... +Loading hg marks ... +Trimmed hg marks from #5 down to #0 +Writing hg marks ... +Loading git marks ... +Trimmed git marks from #12 down to #2 +Writing git marks ... +ok 5 - subcommand gc + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repos && + + ( + cd hgrepo && + echo one > content && + hg commit -m one + ) && + + ( + cd gitrepo && + git fetch origin + ) && + + hg log -R hgrepo > expected && + # not inside gitrepo; test shared path handling + GIT_DIR=gitrepo/.git git-hg-helper origin log > actual + + test_cmp expected actual + +/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 added 12 changesets with 12 changes to 1 files -new changesets 314cd1461dbb:6686ab41fb18 +new changesets a9f8e2598d41:cd89e31ab453 progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) +Cloning into 'gitrepo'... ok 7 - authors expecting success: @@ -1574,57 +1698,18 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected -/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] -Loading hg marks ... -Loading git marks ... -Performing garbage collection on git commits ... -Computing marks intersection ... -Including notes commits ... -Trimmed hg marks from #5 down to #0 -Trimmed git marks from #12 down to #2 -Writing hg marks ... -Writing git marks ... -Loading hg marks ... -Trimmed hg marks from #5 down to #0 -Writing hg marks ... -Loading git marks ... -Trimmed git marks from #12 down to #2 -Writing git marks ... -ok 5 - subcommand gc - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repos && - - ( - cd hgrepo && - echo one > content && - hg commit -m one - ) && - - ( - cd gitrepo && - git fetch origin - ) && - - hg log -R hgrepo > expected && - # not inside gitrepo; test shared path handling - GIT_DIR=gitrepo/.git git-hg-helper origin log > actual - - test_cmp expected actual - -Cloning into 'gitrepo'... -/build/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 adding changesets adding manifests adding file changes added 12 changesets with 12 changes to 1 files -new changesets 5ddfd1447fed:95e8a7f45340 +new changesets a9f8e2598d41:5a045b694185 progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) +Cloning into 'gitrepo'... ok 7 - authors expecting success: @@ -1664,8 +1749,6 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... marked working directory as branch gamma /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] @@ -1673,22 +1756,12 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 9074245a1e3a +new changesets 418df9278af5 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 -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 3a73416b3048:09b45b914e38 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) /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 @@ -1699,9 +1772,16 @@ 1 local changesets published progress revision 1 'default' (0/1) progress revision 2 'gamma' (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] Cloning into 'gitrepo'... -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/09b45b914e38-5f329c36-backup.hg +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +new changesets 54c59d166925:57bd82e062a0 +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 @@ -1709,31 +1789,33 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets cec68b692591 +new changesets 0191af59e982 progress revision 1 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 55189f8..85988e0 master -> origin/master - 55189f8..85988e0 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 + 2b06b35..5e03e71 master -> origin/master + 2b06b35..5e03e71 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 /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 adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 1 files -new changesets b7d387267bc8:396fca849059 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -searching for changes -no changes found 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/396fca849059-11dd5ec5-backup.hg +saved backup bundle to /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/57bd82e062a0-dfb01232-backup.hg +added 2 changesets with 2 changes to 1 files +new changesets 54c59d166925:57bd82e062a0 searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) searching for changes adding changesets adding manifests @@ -1741,8 +1823,11 @@ added 1 changesets with 0 changes to 0 files searching for changes 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/hgrepo/.hg/strip-backup/57bd82e062a0-dfb01232-backup.hg /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] +0 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 6 - subcommand [some-repo] expecting success: @@ -1777,33 +1862,69 @@ check gitrepo/sub_hg_b HEAD zero_sub_hg_b && check gitrepo/sub_git HEAD zero_sub_git -0 files updated, 0 files merged, 0 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] /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 2 changesets with 2 changes to 1 files (+1 heads) -new changesets 06fbf92609db:88d47ec217e0 +new changesets 2066aa49c346:17e28db4b4b3 progress revision 2 'default' (0/2) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - + 8671ccc...2fba772 master -> origin/master (forced update) - + 8671ccc...2fba772 branches/default -> origin/branches/default (forced update) + + c85282b...33ce61b master -> origin/master (forced update) + + c85282b...33ce61b branches/default -> origin/branches/default (forced update) +ok 4 - hg branch + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + ( + git init -q gitrepo && + cd gitrepo && + + echo alpha > alpha && + git add alpha && + git commit -m "add alpha" && + git checkout -q -b not-master + ) && + + ( + hg_clone gitrepo hgrepo && + + cd hgrepo && + hg co default && + hg tag alpha + ) && + + hg_push hgrepo gitrepo && + # pushing a fetched tag is a problem ... + { hg_clone gitrepo hgrepo2 || true ; } && + + # fetch does not affect phase, but pushing now does + hg_log hgrepo | grep -v phase > expected && + hg_log hgrepo2 | grep -v phase > actual && + + test_cmp expected actual + +[master (root-commit) 223a6f6] add alpha + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 alpha +/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 0bf213469df9:6503462d1fac +new changesets 2066aa49c346:d64ac90a989e progress revision 2 'default' (0/2) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - + 154b7bf...827ebed master -> origin/master (forced update) - + 154b7bf...827ebed branches/default -> origin/branches/default (forced update) + + c85282b...5111972 master -> origin/master (forced update) + + c85282b...5111972 branches/default -> origin/branches/default (forced update) ok 8 - strip expecting success: @@ -1830,6 +1951,8 @@ check_branch hgrepo default two +/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: @@ -1856,45 +1979,6 @@ check_branch hgrepo default two -ok 4 - hg branch - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - ( - git init -q gitrepo && - cd gitrepo && - - echo alpha > alpha && - git add alpha && - git commit -m "add alpha" && - git checkout -q -b not-master - ) && - - ( - hg_clone gitrepo hgrepo && - - cd hgrepo && - hg co default && - hg tag alpha - ) && - - hg_push hgrepo gitrepo && - # pushing a fetched tag is a problem ... - { hg_clone gitrepo hgrepo2 || true ; } && - - # fetch does not affect phase, but pushing now does - hg_log hgrepo | grep -v phase > expected && - hg_log hgrepo2 | grep -v phase > actual && - - test_cmp expected actual - -[master (root-commit) 223a6f6] add alpha - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 alpha -/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 @@ -1902,115 +1986,63 @@ adding file changes added 1 changesets with 1 changes to 1 files searching for changes -Cloning into 'gitrepo'... 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 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 +/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 adding changesets adding manifests adding file changes -adding remote bookmark master -added 2 changesets with 2 changes to 1 files -new changesets 35ccabe53737:bd67cbd2fbe4 -progress revision walk 'bookmarks/default' (1/1) -progress revision 0 'default' (0/2) -[default 20caddd] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +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) 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/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] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes adding remote bookmark master added 2 changesets with 2 changes to 1 files -new changesets d7e38e21b2e1:1f6862455b64 +new changesets 7cdeb1810b14:495b30dc28b4 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 8206d11] two +[default 87c518f] 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 - 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.main-push/hgrepo - fffffff..20caddd default -> default -searching for changes -adding changesets -adding manifests -adding file changes -adding remote bookmark not-master -added 1 changesets with 1 changes to 1 files -new changesets 16869bbe54be -1 local changesets published -progress revision 1 'default' (0/1) /build/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 -ok 9 - remote push with master bookmark - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo*" && - - hg init hgrepo && - - ( - git init gitrepo && - cd gitrepo && - git remote add origin "hg::../hgrepo" && - echo one > content && - git add content && - git commit -a -m one && - git push origin master - ) && - - hg -R hgrepo log > actual && - cat actual && - test_cmp expected actual && - - check_branch hgrepo default one - -Cloning into 'gitrepo'... -added 1 changesets with 1 changes to 1 files -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - 953a06d..8206d11 default -> default +adding remote bookmark master +added 2 changesets with 2 changes to 1 files +new changesets 7cdeb1810b14:495b30dc28b4 /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] -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 +progress revision walk 'bookmarks/default' (1/1) +progress revision 0 'default' (0/2) searching for changes no changes found -/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 2 changesets with 2 changes to 2 files +[default 87c518f] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +Cloning into 'gitrepo'... searching for changes searching for changes To hg::../hgrepo2 @@ -2019,12 +2051,36 @@ * [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-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +hint: Updates were rejected because the tag already exists in the remote. +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..87c518f default -> 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] +/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: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +adding changesets +adding manifests +adding file changes +searching for changes added 2 changesets with 3 changes to 3 files -new changesets c9869686be84:c2686856482f -hint: Updates were rejected because the tag already exists in the remote. +new changesets 2163784b4536:ab1fecaab5b0 +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 + 6662934..87c518f default -> default progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 9 - remote push with master bookmark @@ -2050,24 +2106,11 @@ check_branch hgrepo default one -/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 -To hg::../hgrepo - * [new branch] master -> master -Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ +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'... ok 5 - hg tags expecting success: @@ -2117,12 +2160,6 @@ Date: Mon Jan 1 00:00:00 2007 +0100 1 file changed, 1 insertion(+) create mode 100644 beta -changeset: 0:6e2126489d3d -tag: tip -user: A U Thor -date: Mon Jan 01 00:00:00 2007 +0230 -summary: one - [master d7a1343] add gamma Author: A U Thor Date: Mon Jan 1 00:00:00 2007 -0100 @@ -2133,65 +2170,95 @@ Date: Mon Jan 1 00:00:00 2007 +0130 1 file changed, 1 insertion(+) create mode 100644 delta -/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] [master f12dbdf] add epsilon Author: A U Thor Date: Mon Jan 1 00:00:00 2007 -0130 1 file changed, 1 insertion(+) create mode 100644 epsilon -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] +Cloning into './sub_hg_a'... +ok 9 - remote push with master bookmark + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo*" && + + hg init hgrepo && + + ( + git init gitrepo && + cd gitrepo && + git remote add origin "hg::../hgrepo" && + echo one > content && + git add content && + git commit -a -m one && + git push origin master + ) && + + hg -R hgrepo log > actual && + cat actual && + test_cmp expected actual && + + check_branch hgrepo default one + +/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 +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ added 1 changesets with 1 changes to 1 files To hg::../hgrepo * [new branch] master -> master +[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-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -ok 10 - remote push from master branch - -expecting success: - test_when_finished "rm -rf gitrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - ) && - - git clone "hg::hgrepo" gitrepo && - check gitrepo HEAD zero - adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 5aa8df21efdd +new changesets 05fb9c923441 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -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] +Cloning into './sub_hg_b'... +no changes found changeset: 0:6e2126489d3d tag: tip user: A U Thor date: Mon Jan 01 00:00:00 2007 +0230 summary: one -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 5 changesets with 5 changes to 5 files +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::../hgrepo + * [new branch] master -> master /build/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 8a2f61159c03 ok 10 - remote push from master branch expecting success: @@ -2208,15 +2275,16 @@ 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 7278f4b5b0f8 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) Cloning into './sub_git'... done. +changeset: 0:6e2126489d3d +tag: tip +user: A U Thor +date: Mon Jan 01 00:00:00 2007 +0230 +summary: one + ok 7 - subcommand sub initial update (hg and git subrepos) expecting success: @@ -2242,25 +2310,50 @@ check gitrepo/sub_hg_a/sub_hg_a_x HEAD zero_sub_hg_a_x && check gitrepo/sub_hg_b/sub_git HEAD zero_sub_git -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] -/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 10 - remote push from master branch + +expecting success: + test_when_finished "rm -rf gitrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) && + + git clone "hg::hgrepo" gitrepo && + check gitrepo HEAD zero + adding changesets adding manifests adding file changes added 5 changesets with 5 changes to 5 files new changesets 87c8f82b00d0:21e96c99dac4 +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/5) +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] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets ceee16a4a9de -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/5) +new changesets 5839dd2e92ed progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +searching for changes +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 5 changes to 5 files ok 11 - remote cloning expecting success: @@ -2285,25 +2378,16 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets ceee16a4a9de +new changesets 5839dd2e92ed progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) 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 1 changesets with 1 changes to 1 files -new changesets 98302503cea9 +new changesets 8e15571b7b54 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files ok 11 - remote cloning expecting success: @@ -2319,16 +2403,20 @@ 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] +ok 6 - test timezones + +# passed all 6 test(s) +1..6 /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] -no changes found WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +no changes found adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 98302503cea9 +new changesets 8e15571b7b54 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 12 - moving remote clone @@ -2352,12 +2440,14 @@ check_bookmark hgrepo devel devel +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] -Cloning into 'gitrepo'... WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found +/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 12 - moving remote clone expecting success: @@ -2379,57 +2469,46 @@ check_bookmark hgrepo devel devel -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] -Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -added 1 changesets with 1 changes to 1 files -new changesets ceee16a4a9de -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 -[devel 4c9442e] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes adding remote bookmark devel added 1 changesets with 1 changes to 1 files -new changesets 98302503cea9 +new changesets 5839dd2e92ed progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel 1da2574] devel +[devel 6de9ff0] devel 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.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 -no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +adding changesets +adding manifests +adding file changes +adding remote bookmark devel +added 1 changesets with 1 changes to 1 files +new changesets 8e15571b7b54 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[devel 39c3e81] devel + 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 ok 13 - remote update bookmark expecting success: @@ -2447,11 +2526,29 @@ 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 +/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] +adding changesets +adding manifests +adding file changes +adding remote bookmark devel +added 2 changesets with 2 changes to 1 files +new changesets 5839dd2e92ed:afb689e1a3d4 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +[feature-b 452c813] feature-b Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git + 1 file changed, 1 insertion(+), 1 deletion(-) ok 13 - remote update bookmark expecting success: @@ -2471,50 +2568,27 @@ 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] -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -added 2 changesets with 2 changes to 1 files -new changesets ceee16a4a9de:8a5fd19b8aca -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -[feature-b 54c6003] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +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 adding changesets adding manifests adding file changes adding remote bookmark devel added 2 changesets with 2 changes to 1 files -new changesets 98302503cea9:0fd9201460c8 +new changesets 8e15571b7b54:cda83d87b9eb 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 ad7a326] feature-b +[feature-b 192a3a1] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -/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 Cloning into 'gitrepo'... ok 14 - remote new bookmark @@ -2542,6 +2616,36 @@ check_branch hgrepo default bump 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] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 48fda0eeac72:e6806cf6b37e +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 +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 5839dd2e92ed:50ffc6a3f302 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) ok 14 - remote new bookmark expecting success: @@ -2568,26 +2672,11 @@ check_branch hgrepo default bump 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.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.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 2 changesets with 3 changes to 3 files -new changesets 80a3a1dc5325:e201fc6b123e -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark feature-b -added 3 changesets with 3 changes to 1 files -new changesets ceee16a4a9de:8f6df014e69a -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) +Cloning into './sub_hg_a'... +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.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 @@ -2598,75 +2687,53 @@ adding remote bookmark devel adding remote bookmark feature-b added 3 changesets with 3 changes to 1 files -new changesets 98302503cea9:87aa735e2171 +new changesets 8e15571b7b54:0b896c6a7bda progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) -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] -Cloning into './sub_hg_a'... -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(leaving bookmark devel) -[master 1be8ba5] 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 be12c87] 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 6e5ca22115a1:7007c75ef77e +new changesets 83cd76637db4:fb8b1baf99e8 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +[master 673b6c0] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(leaving bookmark devel) Cloning into './sub_hg_a/sub_hg_a_x'... -/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.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -searching for changes +[master fe5390c] diverged + 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 75486103d34f -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-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.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 +new changesets db636714a044 +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] -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 7a6bdb138abf -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo +new changesets 3e2a3ac7977e +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) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 215f7fe4e656 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +Cloning into './sub_hg_b'... ok 15 - remote push diverged expecting success: @@ -2698,7 +2765,33 @@ check_bookmark hgrepo diverge "bump bookmark" -Cloning into './sub_hg_b'... +/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 315f0cbf5f8a +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/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 2 changesets with 3 changes to 3 files +new changesets 53df7791bf35:423d48fd07c5 +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 ok 15 - remote push diverged @@ -2731,19 +2824,9 @@ check_bookmark hgrepo diverge "bump bookmark" -/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 54e8171ceb99:16bf063f8f29 -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 -Cloning into 'gitrepo'... Cloning into './sub_hg_b/sub_git'... done. +Cloning into 'gitrepo'... ok 8 - subcommand sub initial recursive update expecting success: @@ -2751,6 +2834,7 @@ test_sub_update +1 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] Cloning into 'gitrepo'... @@ -2761,7 +2845,7 @@ adding remote bookmark diverge adding remote bookmark feature-b added 4 changesets with 4 changes to 1 files -new changesets ceee16a4a9de:75486103d34f +new changesets 5839dd2e92ed:3e2a3ac7977e 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/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead @@ -2775,15 +2859,15 @@ adding remote bookmark diverge adding remote bookmark feature-b added 4 changesets with 4 changes to 1 files -new changesets 98302503cea9:7a6bdb138abf +new changesets 8e15571b7b54:315f0cbf5f8a progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) created new head -[diverge c1ed18d] diverge +[diverge 2fc761b] diverge Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) created new head -[diverge 5ea96dd] diverge +[diverge e1d6d77] diverge 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 @@ -2794,7 +2878,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 63fad7002b72 +new changesets 9c28746eeb11 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' @@ -2803,23 +2887,6 @@ hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] diverge -> diverge (non-fast-forward) -ok 16 - remote update bookmark diverge - -expecting success: - test_when_finished "rm -rf gitrepo*" && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git checkout --quiet -b feature-c HEAD^ && - echo feature-c > content && - git commit -a -m feature-c && - git push --quiet origin feature-c - ) && - - check_bookmark hgrepo feature-c feature-c - -Cloning into 'gitrepo'... /build/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 @@ -2830,7 +2897,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 5443f1d018c1 +new changesets ec040aa79edd 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' @@ -2839,19 +2906,6 @@ hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] diverge -> diverge (non-fast-forward) -/build/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 devel -adding remote bookmark diverge -adding remote bookmark feature-b -added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets ceee16a4a9de:63fad7002b72 -WARNING: Branch 'default' has more than one head, consider merging -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/4) ok 16 - remote update bookmark diverge expecting success: @@ -2869,37 +2923,75 @@ check_bookmark hgrepo feature-c feature-c Cloning into 'gitrepo'... -[feature-c 4e92d3a] feature-c +ok 16 - remote update bookmark diverge + +expecting success: + test_when_finished "rm -rf gitrepo*" && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git checkout --quiet -b feature-c HEAD^ && + echo feature-c > content && + git commit -a -m feature-c && + git push --quiet origin feature-c + ) && + + check_bookmark hgrepo feature-c feature-c + +Cloning into 'gitrepo'... +/build/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 devel +adding remote bookmark diverge +adding remote bookmark feature-b +added 5 changesets with 5 changes to 1 files (+1 heads) +new changesets 5839dd2e92ed:9c28746eeb11 +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 57b25a3] 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 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 -no changes found adding manifests adding file changes adding remote bookmark devel adding remote bookmark diverge adding remote bookmark feature-b added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets 98302503cea9:5443f1d018c1 -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) +new changesets 8e15571b7b54:ec040aa79edd 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 99616e2] feature-c +[feature-c b956626] 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-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 (+1 heads) /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 (+1 heads) ok 17 - remote new bookmark multiple branch head expecting success: @@ -2939,14 +3031,6 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) ok 17 - remote new bookmark multiple branch head checking known breakage: @@ -2986,46 +3070,46 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) -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 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] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 70e67b5c3432 +new changesets 482bd9aef7af 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 -[master e098e0b] copy +[master 2e427c0] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master 4248d29] moved +[master 4e98f76] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) +/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 7241ee2b6de8 +new changesets 482bd9aef7af progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 2806857] copy +[master 2e427c0] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master 967b08a] moved +[master 4e98f76] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) @@ -3037,10 +3121,11 @@ adding manifests 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..4e98f76 master -> master +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] -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..4248d29 master -> master WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found @@ -3050,8 +3135,7 @@ 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/hgrepo - af8c79d..967b08a master -> master -Cloning into 'gitrepo'... + aac1a3f..4e98f76 master -> master 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] @@ -3059,10 +3143,10 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -new changesets 8f850ce68e21:52f2019a54ff +new changesets ecbfc2f94218:9a05c3be1f13 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 ok 18 - push commits with copy and rename expecting success: @@ -3132,15 +3216,15 @@ 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] +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 45a95a3ae1db:86374bcc0c71 +new changesets 84a87f87b796:c32d2546f213 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: 'ø~?' 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] @@ -3148,32 +3232,39 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 681f4028644d +new changesets e3d985b42128 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) Cloning into './sub_hg_b'... /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: 'ø~?' -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 5f405e8a72a0:26dd19c84aa0 +new changesets 6e20dffb322f:bf6547652111 +warning: filename contains '?', which is reserved on Windows: 'ø~?' 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'... +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 5b824fa58abe:ded23aa4aeb3 +new changesets 68f9e4756ad2:9be5e7a58c86 +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 418cfb0609d2:1d3d282f81dc progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) ok 19 - fetch special filenames @@ -3214,13 +3305,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 5b824fa58abe:ba0257a8265c -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) ok 19 - fetch special filenames expecting success: @@ -3259,84 +3343,95 @@ printf "content\næ rø\n" > 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] +Cloning into 'gitrepo'... searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 882e1e24214e +new changesets 85882d3b68a0 progress revision 2 'default' (0/1) -Cloning into 'gitrepo'... From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - ca6d3b8..ba4cf78 master -> origin/master - ca6d3b8..ba4cf78 branches/default -> origin/branches/default -Cloning into 'gitrepo'... -Updating ca6d3b8..ba4cf78 + a433eb2..79f595c master -> origin/master + a433eb2..79f595c branches/default -> origin/branches/default +Updating a433eb2..79f595c Fast-forward .hgsubstate | 2 +- 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] +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 d38383156f4e +new changesets 55fe3745adf6 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master d689eb4] utf-8 - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 "\303\246 r\303\270" -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets d38383156f4e +new changesets 55fe3745adf6 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-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +[master f3c3fb8] utf-8 + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 "\303\246 r\303\270" +/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 d689eb4] utf-8 +[master f3c3fb8] utf-8 Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 "\303\246 r\303\270" +no changes found +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] searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets f1257c558b87 -progress revision 2 'default' (0/1) -no changes found -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - df2a9f7..2ca005d branches/default -> origin/branches/default - df2a9f7..2ca005d master -> origin/master +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..f3c3fb8 master -> master searching for changes +no changes found adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..d689eb4 master -> master -HEAD is now at df2a9f7 substate_hg_a -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -no changes found +new changesets 106c2f1bbeec +progress revision 2 'default' (0/1) searching for changes adding changesets adding manifests adding file changes +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a + eceecf9..4cb8664 branches/default -> origin/branches/default + eceecf9..4cb8664 master -> origin/master 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 - f391291..d689eb4 master -> master + b48fcf6..f3c3fb8 master -> master +HEAD is now at eceecf9 substate_hg_a +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 31b31f9bcd9c +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 + cad03fe..1503efd branches/default -> origin/branches/default + cad03fe..1503efd master -> origin/master ok 20 - push special filenames expecting success: @@ -3382,18 +3477,7 @@ 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 72d4c6edbcef -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 - b3c4aa5..dae21ed branches/default -> origin/branches/default - b3c4aa5..dae21ed master -> origin/master -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -HEAD is now at b3c4aa5 zero_sub_hg_a_x +HEAD is now at cad03fe zero_sub_hg_a_x ok 20 - push special filenames expecting success: @@ -3460,17 +3544,17 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 564ce88bd932:795fa717cb52 +new changesets 47d3af8ca84f:aeaa0ff95bc6 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) +HEAD is now at a688afb zero +HEAD is now at a688afb zero /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 81e2192 zero -HEAD is now at 81e2192 zero -HEAD is now at c4cda0d good branch +HEAD is now at 5d0d094 good branch adding changesets adding manifests adding file changes @@ -3478,18 +3562,13 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets b3d6f2f7ae30:564b2bff7142 +new changesets 0f0ec72d39b6:99583030c67c progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at a58ecb3 zero -HEAD is now at a58ecb3 zero -HEAD is now at 70cc17c 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 82a3548 zero +HEAD is now at 82a3548 zero +HEAD is now at 7ec9d57 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] no changes found @@ -3519,9 +3598,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..078d69b branches/good_branch -> branches/good_branch - fffffff..225040c good_bmark -> good_bmark - fffffff..4229262 master -> master + fffffff..9aab12a branches/good_branch -> branches/good_branch + fffffff..6f22177 good_bmark -> good_bmark + fffffff..8c535bb 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) @@ -3532,23 +3611,28 @@ 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..4229262 master -> master - fffffff..225040c good_bmark -> good_bmark - fffffff..078d69b branches/good_branch -> branches/good_branch + fffffff..8c535bb master -> master + fffffff..6f22177 good_bmark -> good_bmark + fffffff..9aab12a 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 /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 - 70cc17c..e09f41f branches/good_branch -> branches/good_branch - 48d3dc3..48c79b3 good_bmark -> good_bmark - 48d3dc3..f5c2b48 master -> master + 7ec9d57..55732d3 branches/good_branch -> branches/good_branch + 3891c4c..100694c good_bmark -> good_bmark + 3891c4c..ca85ca5 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) @@ -3559,9 +3643,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. - 48d3dc3..f5c2b48 master -> master - 48d3dc3..48c79b3 good_bmark -> good_bmark - 70cc17c..e09f41f branches/good_branch -> branches/good_branch + 3891c4c..ca85ca5 master -> master + 3891c4c..100694c good_bmark -> good_bmark + 7ec9d57..55732d3 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) @@ -3574,21 +3658,12 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 2e8c6c9f47fe:e7bc4dd88d8a +new changesets 959955c9d1b7:7a87ce269e38 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 f7ab9d17ca17:a498ff4a1f7d -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) ok 21 - remote big push expecting success: @@ -3665,7 +3740,6 @@ fi ) -Cloning into './sub_hg_a/sub_hg_a_x'... ok 21 - remote big push expecting success: @@ -3747,8 +3821,18 @@ adding changesets adding manifests adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 8f32f5c8520f:ba93196367ae +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 8c4c0075690f +new changesets 5af043df6109 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) Cloning into './sub_hg_b'... @@ -3758,57 +3842,57 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets c98c7abbc20b:54750e930540 +new changesets bdafc0099cec:9ebad6ed5005 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into './sub_hg_b/sub_git'... done. Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/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 4fd26d3221b3 /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] -progress revision 2 'default' (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 +/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] -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 8f13e54..e544e94 master -> origin/master - 8f13e54..e544e94 branches/default -> origin/branches/default -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways 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 -Updating 8f13e54..e544e94 +new changesets 694bc537942d:1773d066eb4e +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 3e6f2de77738 +progress revision 2 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + 72082a4..434f52f master -> origin/master + 72082a4..434f52f branches/default -> origin/branches/default +Updating 72082a4..434f52f Fast-forward .hgsubstate | 2 +- 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 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 5b989d2f2ba1:55c5930ba5dd +new changesets 694bc537942d:619f318ad686 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'bad_branch' (0/2) -new changesets a63a4139e711:e1f034371e5e /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] -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'bad_branch' (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 @@ -3816,36 +3900,44 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets a31d484b071d +new changesets 2b8be95081d9 progress revision 2 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - 981b7ef..d76a798 branches/default -> origin/branches/default - 981b7ef..d76a798 master -> origin/master -HEAD is now at 981b7ef substate_hg_a + 865bd01..f3252dc branches/default -> origin/branches/default + 865bd01..f3252dc master -> origin/master +HEAD is now at 865bd01 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 +/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 updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets 598df51001bb -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 439afd0..5f78800 good_bmark -> good_bmark - 439afd0..8e56d5d master -> master +new changesets 76d291fa032a +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..c7f64dc good_bmark -> good_bmark + fffffff..50350e1 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' +error: failed to push some refs to 'hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. 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. - 439afd0..8e56d5d master -> master - 439afd0..5f78800 good_bmark -> good_bmark + fffffff..50350e1 master -> master + fffffff..c7f64dc 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 @@ -3854,78 +3946,75 @@ adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets e6e8c737b32e -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 - e7f6864..a071f0a branches/default -> origin/branches/default - e7f6864..a071f0a 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 e7f6864 zero_sub_hg_a_x - Successfully rebased and updated detached HEAD. -no changes found -progress revision 3 'bad_branch' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - f0ba3c0..d845ca5 branches/bad_branch -> origin/branches/bad_branch - 439afd0..d845ca5 bad_bmark -> origin/bad_bmark - + 5f78800...439afd0 good_bmark -> origin/good_bmark (forced update) - + 8e56d5d...439afd0 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] searching for changes adding changesets adding manifests adding file changes updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets f68c7602a431 -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..b86bb39 good_bmark -> good_bmark - fffffff..10580a5 master -> master +new changesets af0acdaad541 +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 577d45b..c7f64dc good_bmark -> good_bmark + 577d45b..50350e1 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' +error: failed to push some refs to 'hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. 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. -/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] - fffffff..10580a5 master -> master - fffffff..b86bb39 good_bmark -> good_bmark + 577d45b..50350e1 master -> master +added 1 changesets with 1 changes to 1 files +new changesets ca67f10912fe + 577d45b..c7f64dc good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +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 + cdf0fc1..7ced7ec branches/default -> origin/branches/default + cdf0fc1..7ced7ec 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] no changes found +updating bookmark good_bmark +2 local changesets published +HEAD is now at cdf0fc1 zero_sub_hg_a_x + Successfully rebased and updated detached HEAD. +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 + daed949..4f062a0 branches/bad_branch -> origin/branches/bad_branch + 577d45b..50350e1 branches/default -> origin/branches/default + 577d45b..4f062a0 bad_bmark -> origin/bad_bmark /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 - 439afd0..5f78800 good_bmark -> good_bmark - 439afd0..8e56d5d master -> master +progress revision 3 'bad_branch' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 5092598..7f8256b branches/bad_branch -> origin/branches/bad_branch + 577d45b..7f8256b bad_bmark -> origin/bad_bmark + + c7f64dc...577d45b good_bmark -> origin/good_bmark (forced update) + + 50350e1...577d45b master -> origin/master (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] +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 +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) -error: failed to push some refs to 'hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' +error: failed to push some refs to 'hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. 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. - 439afd0..8e56d5d master -> master - 439afd0..5f78800 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 @@ -3972,13 +4061,6 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six -/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 -updating bookmark good_bmark -2 local changesets published -WARNING: Branch 'default' has more than one head, consider merging -progress revision 3 'bad_branch' (0/1) ok 10 - subcommand sub subsequent recursive update -- rebase expecting success: @@ -3986,21 +4068,23 @@ test_sub_update --merge -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - a2e4b68..d0a11e8 branches/bad_branch -> origin/branches/bad_branch - 8c14ec2..10580a5 branches/default -> origin/branches/default - 8c14ec2..d0a11e8 bad_bmark -> origin/bad_bmark -/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 no changes found -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 577d45b..c7f64dc good_bmark -> good_bmark + 577d45b..50350e1 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' +error: failed to push some refs to 'hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. 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. + 577d45b..50350e1 master -> master + 577d45b..c7f64dc 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 @@ -4048,10 +4132,18 @@ check_bookmark hgrepo new_bmark six Cloning into 'gitrepo'... +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/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 @@ -4059,18 +4151,27 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 8e0074647a25:707a1336a94e +new changesets 5c799b5e7ec5:f4ef56cd8ae5 +adding changesets +adding manifests +adding file changes progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 35464ed zero -HEAD is now at 35464ed zero -HEAD is now at d3f1509 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 +adding remote bookmark bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +added 4 changesets with 4 changes to 1 files +new changesets 5c799b5e7ec5:f4ef56cd8ae5 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 9702610 zero +HEAD is now at 9702610 zero +HEAD is now at 9702610 zero +HEAD is now at 7f9578f good branch +HEAD is now at 9702610 zero +HEAD is now at 7f9578f 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 @@ -4082,49 +4183,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 - + aa3b4ab...d6e69c6 branches/bad_branch -> branches/bad_branch (forced update) - d3f1509..e7d85df branches/good_branch -> branches/good_branch - + aca5c2c...0cdf9ef bad_bmark1 -> bad_bmark1 (forced update) - + aca5c2c...516718f bad_bmark2 -> bad_bmark2 (forced update) - aca5c2c..49d9b8e good_bmark -> good_bmark - aca5c2c..598ec80 master -> master + + db7af74...ce02574 branches/bad_branch -> branches/bad_branch (forced update) + 7f9578f..c2ce036 branches/good_branch -> branches/good_branch + + 16bb0e6...b9e3713 bad_bmark1 -> bad_bmark1 (forced update) + + 16bb0e6...d12cc34 bad_bmark2 -> bad_bmark2 (forced update) + 16bb0e6..c51c44e good_bmark -> good_bmark + 16bb0e6..1500bcf master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - aca5c2c..598ec80 master -> master - aca5c2c..49d9b8e good_bmark -> good_bmark - d3f1509..e7d85df branches/good_branch -> branches/good_branch + 16bb0e6..1500bcf master -> master + 16bb0e6..c51c44e good_bmark -> good_bmark + 7f9578f..c2ce036 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + aca5c2c...0cdf9ef bad_bmark1 -> bad_bmark1 (forced update) - + aca5c2c...516718f bad_bmark2 -> bad_bmark2 (forced update) - + aa3b4ab...d6e69c6 branches/bad_branch -> branches/bad_branch (forced update) -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] -adding changesets -adding manifests -adding file changes -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets 8e9f186fceb1:be152258cb45 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at 7950ebe zero -HEAD is now at 7950ebe zero -HEAD is now at f2bf941 good branch -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 eaedc4109630:aa64f55c0f38 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) + + 16bb0e6...b9e3713 bad_bmark1 -> bad_bmark1 (forced update) + + 16bb0e6...d12cc34 bad_bmark2 -> bad_bmark2 (forced update) + + db7af74...ce02574 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 @@ -4169,25 +4243,55 @@ 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...a58bd58 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...94bc1fd branches/good_branch -> branches/good_branch (forced update) - + fffffff...1843ef4 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...49e3403 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...41ecd38 good_bmark -> good_bmark (forced update) - + fffffff...6a49641 master -> master (forced update) + + fffffff...ce02574 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...c2ce036 branches/good_branch -> branches/good_branch (forced update) + + fffffff...b9e3713 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...d12cc34 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...c51c44e good_bmark -> good_bmark (forced update) + + fffffff...1500bcf master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...6a49641 master -> master (forced update) - + fffffff...41ecd38 good_bmark -> good_bmark (forced update) - + fffffff...94bc1fd branches/good_branch -> branches/good_branch (forced update) + + fffffff...1500bcf master -> master (forced update) + + fffffff...c51c44e good_bmark -> good_bmark (forced update) + + fffffff...c2ce036 branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...1843ef4 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...49e3403 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...a58bd58 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...b9e3713 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...d12cc34 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...ce02574 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 bac043fbfb1c:9ca9601ece66 +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 17dcf2e97ce6:b533501ff6d9 +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 a8150caf113a +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: @@ -4227,28 +4331,6 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_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] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets e9d7b21d5e97:a91e54094f66 -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 9522ad3fc114 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... -/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 expecting success: @@ -4288,11 +4370,13 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_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] adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 32448309f585:0cc1673aafe7 +new changesets 488d80adaeaf:9c9a5f3ffdde progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into './sub_hg_b/sub_git'... @@ -4304,80 +4388,35 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 011d86ed5619 +new changesets 71cd95bc6845 progress revision 2 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 4917f3f..fd3643b master -> origin/master - 4917f3f..fd3643b branches/default -> origin/branches/default -Updating 4917f3f..fd3643b + d0309c4..27b0590 master -> origin/master + d0309c4..27b0590 branches/default -> origin/branches/default +Updating d0309c4..27b0590 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-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 -adding changesets -adding manifests -adding file changes -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets b04c27577e39:71eddb08a5eb -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.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -HEAD is now at ee976be zero -HEAD is now at ee976be zero searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 5b86e273743e +new changesets 530e32402c6b progress revision 2 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - 7a3abc4..2508274 branches/default -> origin/branches/default - 7a3abc4..2508274 master -> origin/master -HEAD is now at 16b3ddb good branch -HEAD is now at 7a3abc4 substate_hg_a -Updating 7a3abc4..2508274 + eb538ec..b281641 branches/default -> origin/branches/default + eb538ec..b281641 master -> origin/master +HEAD is now at eb538ec substate_hg_a +Updating eb538ec..b281641 Fast-forward .hgsubstate | 2 +- 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 - 16b3ddb..a6e2e1c branches/good_branch -> branches/good_branch - e6bd375..47e3bac good_bmark -> good_bmark - e6bd375..0c4295e 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) - ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) - ! [rejected] bad_bmark2 -> bad_bmark2 (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' -hint: Updates were rejected because a pushed branch tip is behind its remote -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. - e6bd375..0c4295e master -> master - e6bd375..47e3bac good_bmark -> good_bmark - 16b3ddb..a6e2e1c branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) - ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) - ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +Cloning into 'gitrepo'... /build/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 @@ -4385,17 +4424,35 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 66f1a08d6e0a -Cloning into 'gitrepo'... +new changesets bcb8571e683b progress revision 1 'default' (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] From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 8d72aef..daa9fde branches/default -> origin/branches/default - 8d72aef..daa9fde master -> origin/master -HEAD is now at 8d72aef zero_sub_hg_a_x -Updating 8d72aef..daa9fde + fe7bd7b..c49292d branches/default -> origin/branches/default + fe7bd7b..c49292d master -> origin/master +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... +adding changesets +adding manifests +adding file changes +adding remote bookmark bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +added 4 changesets with 4 changes to 1 files +new changesets 7e267d7b3877:767b4a286436 +HEAD is now at fe7bd7b zero_sub_hg_a_x +Updating fe7bd7b..c49292d Fast-forward content_sub_hg_a_x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at b19700a zero +HEAD is now at b19700a zero +HEAD is now at bd8f623 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 @@ -4405,46 +4462,57 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 3b1871bd11ac:ea290c6e49ac +new changesets 7e267d7b3877:767b4a286436 +/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] progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) +no changes found +HEAD is now at b19700a zero +HEAD is now at b19700a zero +HEAD is now at bd8f623 good branch +ok 11 - subcommand sub subsequent recursive update -- merge + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_foreach + /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 - 16b3ddb..a6e2e1c branches/good_branch -> branches/good_branch - e6bd375..47e3bac good_bmark -> good_bmark - e6bd375..0c4295e master -> master - * [new branch] new_bmark -> new_bmark + bd8f623..2290aba branches/good_branch -> branches/good_branch + 16685b0..2d533d4 good_bmark -> good_bmark + 16685b0..afd355a master -> master * [new branch] branches/new_branch -> branches/new_branch - e6bd375..0c4295e master -> master - e6bd375..47e3bac good_bmark -> good_bmark - 16b3ddb..a6e2e1c branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) + ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) + ! [rejected] bad_bmark2 -> bad_bmark2 (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' +hint: Updates were rejected because a pushed branch tip is behind its remote +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. + 16685b0..afd355a master -> master + 16685b0..2d533d4 good_bmark -> good_bmark + bd8f623..2290aba 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.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -HEAD is now at 887d990 zero -HEAD is now at 887d990 zero -no changes found -HEAD is now at ba32b2c good branch -ok 11 - subcommand sub subsequent recursive update -- merge - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_foreach - + ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) + ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) + ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) /build/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..01e449d branches/good_branch -> branches/good_branch - fffffff..9ee0eef good_bmark -> good_bmark - fffffff..3089699 master -> master + fffffff..2290aba branches/good_branch -> branches/good_branch + fffffff..2d533d4 good_bmark -> good_bmark + fffffff..afd355a master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) @@ -4455,26 +4523,42 @@ 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..3089699 master -> master - fffffff..9ee0eef good_bmark -> good_bmark - fffffff..01e449d branches/good_branch -> branches/good_branch + fffffff..afd355a master -> master + fffffff..2d533d4 good_bmark -> good_bmark + fffffff..2290aba branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +/build/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 + bd8f623..2290aba branches/good_branch -> branches/good_branch + 16685b0..2d533d4 good_bmark -> good_bmark + 16685b0..afd355a master -> master + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + 16685b0..afd355a master -> master + 16685b0..2d533d4 good_bmark -> good_bmark + bd8f623..2290aba 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..01e449d branches/good_branch -> branches/good_branch - fffffff..9ee0eef good_bmark -> good_bmark - fffffff..3089699 master -> master + fffffff..2290aba branches/good_branch -> branches/good_branch + fffffff..2d533d4 good_bmark -> good_bmark + fffffff..afd355a master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - fffffff..3089699 master -> master - fffffff..9ee0eef good_bmark -> good_bmark - fffffff..01e449d branches/good_branch -> branches/good_branch + fffffff..afd355a master -> master + fffffff..2d533d4 good_bmark -> good_bmark + fffffff..2290aba 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 @@ -4573,81 +4657,60 @@ 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] -/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 -adding changesets -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -adding manifests -adding file changes -added 4 changesets with 4 changes to 1 files -new changesets 12610db77bf0:c5a7e8bb8675 added 2 changesets with 3 changes to 3 files -new changesets c462e7faeceb:4f4150f10d1e +new changesets 6e3ce17ddc54:361f24857149 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 0f79924 zero -HEAD is now at 0f79924 zero -HEAD is now at 687b53c 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_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 -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 - + 5feb63a...61f9c92 branches/bad_branch -> branches/bad_branch (forced update) - 687b53c..001ef3a branches/good_branch -> branches/good_branch - + 045280a...9e4e696 bad_bmark1 -> bad_bmark1 (forced update) - + 045280a...365b436 bad_bmark2 -> bad_bmark2 (forced update) - 045280a..18449e1 good_bmark -> good_bmark - 045280a..c4aec42 master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - 045280a..c4aec42 master -> master - 045280a..18449e1 good_bmark -> good_bmark - 687b53c..001ef3a branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + 045280a...9e4e696 bad_bmark1 -> bad_bmark1 (forced update) - + 045280a...365b436 bad_bmark2 -> bad_bmark2 (forced update) - + 5feb63a...61f9c92 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 c6bdaf9db004:eb8088245a98 +new changesets 3786a585f8c7:2b91d2171b3d progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... 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] -/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 +Cloning into 'gitrepo'... adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets cecd49f18c5c +new changesets 13bf70b3a3de +adding changesets +adding manifests +adding file changes progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +adding remote bookmark bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +added 4 changesets with 4 changes to 1 files +new changesets 2a03be72768a:1e46bcb71f81 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 07659ed zero +Cloning into './sub_hg_b'... +HEAD is now at 07659ed zero +HEAD is now at 1525052 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 adding manifests adding file changes @@ -4655,50 +4718,71 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 8e4b4017b1a2:5f2afd19942e +new changesets 614365566b22:9e1cc344b92f progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -Cloning into './sub_hg_b'... -HEAD is now at b5bf391 zero -HEAD is now at b5bf391 zero -HEAD is now at 6ac2e55 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] +HEAD is now at 0ecc59c zero +HEAD is now at 0ecc59c zero +HEAD is now at 04aff9e good branch adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 108275e2e7f8:8b4813d5f3d4 +new changesets 6fb8095d387a:bf7798083621 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.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 no changes found -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...2ed0116 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...f90143f branches/good_branch -> branches/good_branch (forced update) - + fffffff...73398ec bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...658d557 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...942a871 good_bmark -> good_bmark (forced update) - + fffffff...46b5676 master -> master (forced update) +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + + a316d6b...0fb5bb3 branches/bad_branch -> branches/bad_branch (forced update) + 1525052..09a467b branches/good_branch -> branches/good_branch + + c45fba0...94033ce bad_bmark1 -> bad_bmark1 (forced update) + + c45fba0...4f39813 bad_bmark2 -> bad_bmark2 (forced update) + c45fba0..25dd70d good_bmark -> good_bmark + c45fba0..0ee662d master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...46b5676 master -> master (forced update) - + fffffff...942a871 good_bmark -> good_bmark (forced update) - + fffffff...f90143f branches/good_branch -> branches/good_branch (forced update) + c45fba0..0ee662d master -> master + c45fba0..25dd70d good_bmark -> good_bmark + 1525052..09a467b branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...73398ec bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...658d557 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...2ed0116 branches/bad_branch -> branches/bad_branch (forced update) + + c45fba0...94033ce bad_bmark1 -> bad_bmark1 (forced update) + + c45fba0...4f39813 bad_bmark2 -> bad_bmark2 (forced update) + + a316d6b...0fb5bb3 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] -hg b846d5bebc0600dca05ad169af826406ed87c682 eb8088245a98d6c066c055e776d268493bddfc3c sub_hg_a /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo -hg fc854019401902a94cd5209ded0f6ce41d7f4787 cecd49f18c5c74f8931ef7e4dac4feb73bbac340 sub_hg_a_x /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a -hg fb780f4a0653cea4426e01c968cdf4ce3b7bf596 8b4813d5f3d4d8c7369c53f5b28426b339f25bc6 sub_hg_b /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/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 +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + + fffffff...c395803 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...0e96d43 branches/good_branch -> branches/good_branch (forced update) + + fffffff...94be50a bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...73a4c2f bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...7696ec3 good_bmark -> good_bmark (forced update) + + fffffff...11158be master -> master (forced update) + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + + fffffff...11158be master -> master (forced update) + + fffffff...7696ec3 good_bmark -> good_bmark (forced update) + + fffffff...0e96d43 branches/good_branch -> branches/good_branch (forced update) + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + fffffff...94be50a bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...73a4c2f bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...c395803 branches/bad_branch -> branches/bad_branch (forced update) +hg 5375d258c2964fa815a70041e099c1bf8188882a 2b91d2171b3dde4cd5e8d4b0724dbd5d042bd977 sub_hg_a /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg 1d4d5d12dd614e848ff01a1e4d62063fbc741f65 13bf70b3a3de43b4302b551131c8a4fa63c279ae sub_hg_a_x /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a +hg 2b917d1bb655d83e2dbe9a92f3d613d0e7b41670 bf77980836218ce43e5938c33037b4f01a8b7db3 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 ok 12 - subcommand sub foreach @@ -4757,28 +4841,6 @@ test_expect_code 1 git push ) -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 -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 308a5ab74986:87f1ef84c58e -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -HEAD is now at bca5521 zero -[master 8047949] 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.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 25 - remote big push force dry-run expecting success: @@ -4804,104 +4866,75 @@ test_expect_code 1 git push ) -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' -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. +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 8cca84f425f6:7d5f3a11ceda +new changesets d934ca2dc3c2:0504396206a6 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 -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' -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. -ok 26 - remote double failed push - -expecting success: - test_when_finished "rm -rf gitrepo hgrepo" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero && - echo feature-a > content && - hg commit -m feature-a - hg bookmark feature-a - ) && - - git clone "hg::hgrepo" gitrepo && - check gitrepo origin/feature-a feature-a && - - ( - cd hgrepo && - hg bookmark -d feature-a - ) && - - ( - cd gitrepo && - git fetch --prune origin - git branch -a > out && - ! grep feature-a out - ) - -/build/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.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 6bf1b9c95ec7:6affbb3a9003 +new changesets 802338f0a429:59380fc5545d 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] +HEAD is now at 40f1b82 zero +[master 22ff34e] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets d8de2cc1e459 +new changesets 7bfc656bd29e progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -HEAD is now at 0376441 zero -[master 3733cc6] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) - 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] -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 + url = foobar +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +new changesets 802338f0a429:37304b5dc0a7 +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] -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +HEAD is now at 40f1b82 zero +[master 22ff34e] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +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-push/tmp/hgrepo' +error: failed to push some refs to 'hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. 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. +/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] ok 13 - subcommand sub sync expecting success: @@ -4966,9 +4999,6 @@ check_branch hgclone/sub_hg default one_sub_hg && check hgclone/sub_git HEAD one_sub_git -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 To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo ! [rejected] master -> master (non-fast-forward) @@ -4981,6 +5011,55 @@ 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. +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' +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. +ok 26 - remote double failed push + +expecting success: + test_when_finished "rm -rf gitrepo hgrepo" && + + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero && + echo feature-a > content && + hg commit -m feature-a + hg bookmark feature-a + ) && + + git clone "hg::hgrepo" gitrepo && + check gitrepo origin/feature-a feature-a && + + ( + cd hgrepo && + hg bookmark -d feature-a + ) && + + ( + cd gitrepo && + git fetch --prune origin + git branch -a > out && + ! grep feature-a out + ) + +/build/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 + ! [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/tmp/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. ok 26 - remote double failed push expecting success: @@ -5012,12 +5091,43 @@ ! grep feature-a out ) +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 +adding changesets +adding manifests +adding file changes +adding remote bookmark feature-a +added 2 changesets with 2 changes to 1 files +new changesets 0248c939732f:18e7d708e235 +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.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 2 changesets with 2 changes to 1 files -new changesets 5964b7cd6217:5d18b53d1087 +new changesets 0248c939732f:18e7d708e235 +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] +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets c2f11a4827da:25c1e80da22b 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 @@ -5072,43 +5182,15 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -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'... -/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] -Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -adding remote bookmark feature-a -added 2 changesets with 2 changes to 1 files -new changesets d2214758b5d6:d3a506691e9c -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] -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets eb327eae5abc:3e75a7967d5b -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] /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 +Cloning into './sub_hg'... 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 -Cloning into './sub_hg'... -created new head ok 27 - fetch prune expecting success: @@ -5153,42 +5235,23 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/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.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 -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets 73ae0b0642fb:41100ff631be added 1 changesets with 1 changes to 1 files -new changesets 19850f89a1b3 -WARNING: Branch 'default' has more than one head, consider merging -WARNING: Branch 'default' has more than one head, consider merging -progress revision 1 'default' (0/1) +new changesets 6b90236a2ba5 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (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 Cloning into './sub_git'... done. -[detached HEAD a0c68ca] one_sub_hg +[detached HEAD 03e68e5] one_sub_hg Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +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 searching for changes adding changesets @@ -5196,71 +5259,52 @@ 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..a0c68ca HEAD -> master + fffffff..03e68e5 HEAD -> master +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/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 1 local changesets published +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg + f591292..03e68e5 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] -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - f7f9218..a0c68ca branches/default -> origin/branches/default WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -created new head -searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 84adc0f4a41d +created new head [detached HEAD cea1af1] one_sub_git 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.main-push/tmp/gitrepo/ +added 2 changesets with 2 changes to 2 files (+1 heads) +new changesets cc9cf2a2e2aa:69dfb5ae6d94 WARNING: Branch 'default' has more than one head, consider merging -progress revision walk 'branches/default' (2/2) -progress revision 0 'default' (0/2) +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 To /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git * [new branch] HEAD -> new -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + 27e0b82...f664c72 branches/default -> origin/branches/default (forced update) - + 27e0b82...f664c72 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] +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/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] -ok 28 - fetch multiple independent histories - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo a > a && - hg add a && - hg commit -m a && - hg bookmark -r null bookmark - ) && - - ( - git clone "hg::hgrepo" gitrepo && - check gitrepo HEAD a && - cd gitrepo && - git checkout --quiet -b bookmark && - git remote -v && - echo b > b && - git add b && - git commit -m b && - git push origin bookmark - ) - +/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] +1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets 3db641e32932:f68a39c93957 +new changesets cc9cf2a2e2aa:90d6a4c8f2b2 +Updating ./sub_hg to f821a02fd3f6ec0004c78c48806361a7c601d438 [git 03e68e5] +Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] 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) @@ -5269,19 +5313,17 @@ * [new branch] master -> master * [new branch] branches/default -> origin/branches/default * [new branch] master -> origin/master -Updating ./sub_hg to a6bd9ea3c365296ea0836d30dd36ba4eff8bfa60 [git a0c68ca] -Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] diff --git a/.hgsubstate b/.hgsubstate -index de6dbb9..362a09b 100644 +index 776c4fa..e163499 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -1,2 +1,2 @@ -e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git --19850f89a1b3388f1900d7f26ef2b606e5c7ade3 sub_hg +-6b90236a2ba5b789eb1d06df2e38a07e75dfe78a sub_hg +cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git -+a6bd9ea3c365296ea0836d30dd36ba4eff8bfa60 sub_hg ++f821a02fd3f6ec0004c78c48806361a7c601d438 sub_hg M .hgsubstate -[master 3935612] update_sub +[master 3e63d2f] update_sub Author: A U Thor 1 file changed, 2 insertions(+), 2 deletions(-) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -5294,7 +5336,23 @@ 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..3935612 master -> master + fffffff..3e63d2f 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 +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 74842c8fad41 +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 + + de69dfb...f3d619d branches/default -> origin/branches/default (forced update) + + de69dfb...f3d619d 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' @@ -5309,19 +5367,40 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 77a22bd5d98a +new changesets 74842c8fad41 WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'branches/default' (2/2) progress revision 0 'default' (0/2) +ok 28 - fetch multiple independent histories + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo a > a && + hg add a && + hg commit -m a && + hg bookmark -r null bookmark + ) && + + ( + git clone "hg::hgrepo" gitrepo && + check gitrepo HEAD a && + cd gitrepo && + git checkout --quiet -b bookmark && + git remote -v && + echo b > b && + git add b && + git commit -m b && + git push origin bookmark + ) + From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + 46c5c82...505e921 branches/default -> origin/branches/default (forced update) - + 46c5c82...505e921 master -> origin/master (forced update) -Cloning into 'gitrepo'... + + d384dbd...f3d619d branches/default -> origin/branches/default (forced update) + + d384dbd...f3d619d master -> origin/master (forced update) 0 files updated, 0 files merged, 0 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 ok 28 - fetch multiple independent histories expecting success: @@ -5348,25 +5427,6 @@ git push origin bookmark ) -adding changesets -adding manifests -adding file changes -adding remote bookmark bookmark -added 1 changesets with 1 changes to 1 files -new changesets c452f4126467 -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 5ef91bb] b - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 b -/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 ok 14 - subcommand sub addstate expecting success: @@ -5411,56 +5471,48 @@ test_cmp output actual ) -no changes found -WARNING: Ignoring invalid bookmark 'bookmark' -searching for changes +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 adding changesets adding manifests adding file changes +adding remote bookmark bookmark 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 -ok 29 - clone remote with null bookmark, then push - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && - - ( - hg init hgrepo && - cd hgrepo && - echo one > content && - hg add content && - hg commit -m one && - echo two > content && - hg commit -m two - ) && - - git clone "hg::hgrepo" gitrepo && - hg -R hgrepo log --template "{node}\n\n" > expected && - git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && - test_cmp expected actual - -Cloning into 'gitrepo'... +new changesets 3d8073ba9130 +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] +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 a93347f] b + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 b adding changesets adding manifests adding file changes adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -new changesets 225fe4cfa9c2 +new changesets dbeedf8ea9ce 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 8d32ed4] b +[bookmark 2376931] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b -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 +/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: Ignoring invalid bookmark 'bookmark' searching for changes @@ -5468,14 +5520,10 @@ 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] -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new branch] bookmark -> bookmark -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -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] ok 29 - clone remote with null bookmark, then push expecting success: @@ -5496,14 +5544,18 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual +no changes found +WARNING: Ignoring invalid bookmark 'bookmark' +searching for changes +adding changesets +adding manifests adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 88a7b5c1b634:865c3422054b -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -ok 30 - notes +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 + * [new branch] bookmark -> bookmark +ok 29 - clone remote with null bookmark, then push -checking known breakage: +expecting success: test_when_finished "rm -rf hgrepo gitrepo" && ( @@ -5511,18 +5563,12 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one - ) && - - git clone "hg::hgrepo" gitrepo && - - ( - cd gitrepo && + hg commit -m one && echo two > content && - git commit -a -m two && - git push + hg commit -m two ) && + git clone "hg::hgrepo" gitrepo && hg -R hgrepo log --template "{node}\n\n" > expected && git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual @@ -5534,11 +5580,6 @@ create mode 100644 content_sub_git Cloning into 'gitrepo'... 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.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 @@ -5547,33 +5588,22 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 21adfa2e82c3:75f810e4bd0b +new changesets b0eb1babe796:949ae65e911e 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] +Cloning into 'gitrepo'... adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 70b49be4f578:5de466367840 +added 2 changesets with 2 changes to 1 files +new changesets b0eb1babe796:949ae65e911e 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 e717fc0e7d09 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master 8489ac5] 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 ok 30 - notes -expecting success: +checking known breakage: test_when_finished "rm -rf hgrepo gitrepo" && ( @@ -5597,29 +5627,12 @@ 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] -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 +/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 -Cloning into './sub_hg_a'... 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 - df0adc0..8489ac5 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] ---- expected 2023-06-02 01:06:07.607251786 +0000 -+++ actual 2023-06-02 01:06:07.815243802 +0000 -@@ -1,4 +1,3 @@ --b7a193c5457d3a0575ac8db371fd18d1d27b0cfb - - e717fc0e7d0996e05dcc8941302f886d41ab8916 - -not ok 31 - push updates notes # TODO known breakage +ok 30 - notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -5638,77 +5651,131 @@ cd gitrepo && echo two > content && git commit -a -m two && - git push origin master && - git branch feature-a && - git push origin feature-a + git push ) && - check_bookmark hgrepo feature-a two + hg -R hgrepo log --template "{node}\n\n" > expected && + git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && + test_cmp expected actual +added 2 changesets with 3 changes to 3 files +new changesets 05f564200540:4725b8f934fb +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'... +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 1 changesets with 1 changes to 1 files -new changesets 25ed4d9ecf1a +new changesets aba4c59d96e7 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/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 cbf379d13fde /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] +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 f8366e38d2c2 +new changesets cbf379d13fde 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] -Cloning into 'gitrepo'... -[master 61846b9] two +[master c6267ec] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[master c6267ec] 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-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_git'... done. -[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/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 +[detached HEAD cea1af1] one_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) 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 +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 26b3342..c6267ec master -> master +no changes found searching for changes adding changesets -added 1 changesets with 1 changes to 1 files -new changesets 3a72bdd13384 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..c6267ec 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] -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..61846b9 master -> master -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master 4b47f83] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) - 475c26931efd3d7266a70b2be37038901169167b ./sub_hg_a (heads/master) --e52c45e91bf75e4ce07c0d0215ab4fd160cc197b[hg] ./sub_hg_b +--- expected 2024-07-04 07:36:52.533895002 +0000 ++++ actual 2024-07-04 07:36:52.581895002 +0000 +@@ -1,4 +1,3 @@ +-7b4b1f66fa8b738ec5a7f45a10a0a278016f22fc + + cbf379d13fdec7ba936ffe52c330d4ec696135cc + +not ok 31 - push updates notes # TODO known breakage + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + hg init hgrepo && + cd hgrepo && + echo one > content && + hg add content && + hg commit -m one + ) && + + git clone "hg::hgrepo" gitrepo && + + ( + cd gitrepo && + echo two > content && + git commit -a -m two && + git push origin master && + git branch feature-a && + git push origin feature-a + ) && + + check_bookmark hgrepo feature-a two + + fdb843715c09dd6b3fbffa8d5d556beb534b8c2f ./sub_hg_a (heads/master) +-5bc27aefe49fb4833265358c95931a10c0ffbefc[hg] ./sub_hg_b +e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) - 475c26931efd3d7266a70b2be37038901169167b ./sub_hg_a (heads/master) --e52c45e91bf75e4ce07c0d0215ab4fd160cc197b[hg] ./sub_hg_b + fdb843715c09dd6b3fbffa8d5d556beb534b8c2f ./sub_hg_a (heads/master) +-5bc27aefe49fb4833265358c95931a10c0ffbefc[hg] ./sub_hg_b +e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~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] ok 31 - push updates notes expecting success: @@ -5735,16 +5802,6 @@ check_bookmark hgrepo feature-a two -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - daf1c8c..4b47f83 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 @@ -5754,18 +5811,72 @@ # passed all 15 test(s) 1..15 +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] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets f0cea04e23ec +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 f0cea04e23ec +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 92b95dc] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[master 92b95dc] 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 +/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 -1 local changesets published searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +no changes found To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new branch] feature-a -> feature-a -Cloning into 'gitrepo'... + 0e33799..92b95dc master -> 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..92b95dc 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 +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 +1 local changesets published +searching for changes +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new branch] feature-a -> feature-a +no changes found +1 local changesets published +searching for changes +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new branch] feature-a -> feature-a ok 32 - push bookmark without changesets expecting success: @@ -5788,38 +5899,6 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 44cf3617b1e0 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master d2b75c6] 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] -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/tmp/hgrepo - fffffff..d2b75c6 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] -Cloning into 'gitrepo'... -no changes found -1 local changesets published -searching for changes -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new branch] feature-a -> feature-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 -WARNING: various enhanced features might fail in subtle ways ok 32 - push bookmark without changesets expecting success: @@ -5842,30 +5921,57 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual +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] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets e1569a934768 +new changesets d337c18f0440 +adding changesets +adding manifests +adding file changes +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +added 1 changesets with 1 changes to 1 files +new changesets d337c18f0440 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/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] searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 99cd3e2935f0 +new changesets e2a9f8fb188e progress revision 1 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - f159d94..c6cd63e master -> origin/master - f159d94..c6cd63e branches/default -> origin/branches/default + b85646c..8f6db0a master -> origin/master + b85646c..8f6db0a branches/default -> origin/branches/default + * [new tag] v1.0 -> v1.0 +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets e2a9f8fb188e +progress revision 1 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + b85646c..8f6db0a master -> origin/master + b85646c..8f6db0a branches/default -> origin/branches/default * [new tag] v1.0 -> v1.0 -Updating f159d94..c6cd63e +Updating b85646c..8f6db0a Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -5905,31 +6011,7 @@ hg -R hgrepo log --template "{desc}\n" > 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] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 98086839b6b5 -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] -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 6bd3292671bc -progress revision 1 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - eed42a4..d609681 master -> origin/master - eed42a4..d609681 branches/default -> origin/branches/default - * [new tag] v1.0 -> v1.0 -Updating eed42a4..d609681 +Updating b85646c..8f6db0a Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -5969,19 +6051,33 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/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 -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) +/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 509905c7dabe:ef4e1fd5f473 +new changesets 833b1726c23f:fcfc1921e3c1 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'feature' (0/1) +adding changesets +adding manifests +adding file changes +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets dba8ab15af86:5767d5af1899 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) @@ -5989,20 +6085,32 @@ Merge made by the 'ort' strategy. content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Auto-merging content +Merge made by the 'ort' strategy. + content | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) /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 +no changes found 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 - 7ca1ef8..0e19fe9 master -> master -Cloning into 'gitrepo'... + dbe8463..db3770c master -> master +searching for changes +adding changesets +adding manifests +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..c783a9a master -> master ok 34 - push merged named branch expecting success: @@ -6027,35 +6135,6 @@ hg -R hgrepo log --template "{author}\n" -r tip > 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] -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets aacb7489200f:ae3585abb251 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'feature' (0/1) -Auto-merging content -Merge made by the 'ort' strategy. - content | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/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 (-1 heads) -Cloning into 'gitrepo'... -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..72ba46a 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 -WARNING: various enhanced features might fail in subtle ways ok 34 - push merged named branch expecting success: @@ -6080,11 +6159,26 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual +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 +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 9a4b6446ef96 +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 3181657acf64 +new changesets 9a4b6446ef96 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 @@ -6099,7 +6193,16 @@ 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 tag] v1.0 -> v1.0 -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 +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new tag] v1.0 -> v1.0 ok 35 - light tag sets author expecting success: @@ -6129,27 +6232,6 @@ hg -R hgrepo log --template="{branch}\n" -r tip > 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] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 8c3cad27c798 -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] -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/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) ok 35 - light tag sets author expecting success: @@ -6179,47 +6261,54 @@ hg -R hgrepo log --template="{branch}\n" -r tip > actual && test_cmp expected actual +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) 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 added 2 changesets with 2 changes to 1 files -new changesets 50bd5689f76b:22f2f56a558b +new changesets 8ffb85929996:6482221d86ce 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'. +/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 8ffb85929996:cf22210018a0 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'feature' (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 searching for changes adding changesets adding manifests adding file changes +* master 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 tag] v1.0 -> v1.0 +Switched to a new branch 'branches/feature' +branch 'branches/feature' set up to track 'origin/branches/feature'. /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 9e1e55b547f2:8a2d394ac079 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'feature' (0/1) ok 36 - push tag different branch expecting success: @@ -6240,11 +6329,6 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo -* master -Switched to a new branch 'branches/feature' -branch 'branches/feature' set up to track 'origin/branches/feature'. -/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 @@ -6282,7 +6366,7 @@ adding manifests adding file changes added 2 changesets with 1 changes to 1 files -new changesets 5faa71e10e86:507e17bf9a45 +new changesets 0c8842e194fe:ef33337c3dd1 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 37 - cloning a removed file works @@ -6315,7 +6399,7 @@ adding manifests adding file changes added 2 changesets with 1 changes to 1 files -new changesets c08a52a31a34:5ce048dd033f +new changesets 38a32000520f:519a9b9aa462 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 37 - cloning a removed file works @@ -6350,7 +6434,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 3ec27ef6528f:9b3033435fc9 +new changesets 3b33236d9443:b68a418e4d9e progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 38 - cloning a file replaced with a directory @@ -6385,7 +6469,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 0978b2a2443d:c69fd21de81f +new changesets 3b33236d9443:b68a418e4d9e progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 38 - cloning a file replaced with a directory @@ -6422,7 +6506,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets fb99be727a2e:e9026e60fd1a +new changesets 45836cb716fc:2cf59454a32f progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 39 - clone replace directory with a file @@ -6455,11 +6539,9 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 91ce0dc11ac4:4c55163956b1 +new changesets 5724573e7aa5:b2be861a9bd1 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -marked working directory as branch parent -(branches are permanent and global, did you want a bookmark?) ok 39 - clone replace directory with a file expecting success: @@ -6483,19 +6565,22 @@ git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && check_files gitrepo "test.txt" +marked working directory as branch parent +(branches are permanent and global, did you want a bookmark?) marked working directory as branch parent/child -Cloning into 'gitrepo'... marked working directory as branch parent (branches are permanent and global, did you want a bookmark?) +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 adding changesets adding manifests +marked working directory as branch parent/child adding file changes added 3 changesets with 3 changes to 1 files -new changesets 844af365e2ba:7330546b9dd3 +new changesets d8692b2118d5:b941c579dffa WARNING: Ignoring matched branch parent/child progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) @@ -6529,7 +6614,6 @@ test_cmp expected actual -marked working directory as branch parent/child 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] @@ -6537,12 +6621,12 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -new changesets be0f4ad6fcdd:81f253f280ec +new changesets af8a0104b7fb:893e154c593b WARNING: Ignoring matched branch parent/child -Cloning into 'gitrepo'... 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: @@ -6580,14 +6664,14 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 2f54c51e82af +new changesets d56c6d7431f4 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/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 searching for changes adding changesets @@ -6602,7 +6686,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets b726f990ad67 +new changesets 235dc6a858d3 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 41 - push annotated tag @@ -6627,9 +6711,9 @@ git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && test_cmp expected actual +Cloning into 'gitrepo1'... /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] -Cloning into 'gitrepo1'... no changes found searching for changes adding changesets @@ -6671,7 +6755,6 @@ git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && test_cmp expected actual -Cloning into 'gitrepo1'... /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 @@ -6684,20 +6767,16 @@ 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] master -> master +Cloning into 'gitrepo1'... 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. -[master (root-commit) 9f40cc0] two - Author: A U Thor - Date: Mon Sep 26 00:00:00 2016 -0230 - 1 file changed, 1 insertion(+) - create mode 100644 content /build/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. adding changesets adding manifests adding file changes @@ -6705,13 +6784,18 @@ new changesets e522f351d13b 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 (root-commit) 9f40cc0] two + Author: A U Thor + Date: Mon Sep 26 00:00:00 2016 -0230 + 1 file changed, 1 insertion(+) + create mode 100644 content ok 42 - timezone issues with negative offsets # still have 2 known breakage(s) # passed all remaining 40 test(s) 1..42 +/build/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 @@ -6762,7 +6846,7 @@ adding file changes adding remote bookmark feature-a added 1 changesets with 1 changes to 1 files -new changesets 90be618ea385 +new changesets a68808192f38 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 @@ -6809,10 +6893,10 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 95d49d57668e +new changesets 4f4122b50e6a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master dbefad6] one +[master b0dc473] 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 @@ -6858,7 +6942,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 8056e6266d94 +new changesets 73809d1a558d progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -6878,19 +6962,19 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets 5e4ba15af698:be49bd6256a7 +new changesets 5c3c5078336b:9fdc68438e87 progress revision 1 'default' (0/5) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 241988b..b4ffcd7 master -> origin/master - 241988b..b4ffcd7 branches/default -> origin/branches/default -HEAD is now at b4ffcd7 restored + ea4797e..fa31ebf master -> origin/master + ea4797e..fa31ebf branches/default -> origin/branches/default +HEAD is now at fa31ebf 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 6d72978e2e501fd965b709e42c658c2b17d8b69f) + ! [remote rejected] master -> master (rejected not pushing hg based commit 231baab1b97290104246e22fe0a2aaaf767fb537) 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 6d72978e2e501fd965b709e42c658c2b17d8b69f) + ! [remote rejected] master -> master (rejected not pushing hg based commit 231baab1b97290104246e22fe0a2aaaf767fb537) ok 45 - check-hg-commits with fail mode expecting success: @@ -6914,23 +6998,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 - 3e02e5a..20ddff5 master -> origin/master - 3e02e5a..20ddff5 branches/default -> origin/branches/default -HEAD is now at 20ddff5 restored + f9fc90f..179c3e1 master -> origin/master + f9fc90f..179c3e1 branches/default -> origin/branches/default +HEAD is now at 179c3e1 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 660b5a6d825c910942258eb4ca21fafc937c81e7 for 35846cb652e6982ebeae7af3ab4f4da91a993956 -WARNING: Pushing hg changeset c45d7baa7f5992fb2198183da9313b105e9f6e21 for 6df571b688e7e115c853405809c90d2ab5630e17 -WARNING: Pushing hg changeset 1378411f0695e563d29fe61a4afe0f96f19f4c01 for 4e6485b6d4ef23355ee483333ff41a7047834e70 -WARNING: Pushing hg changeset 534763a1c6b7a9068b2bcd52544a2c022f331ae6 for 576e5a72a2ea28a694160167aef15d4292539aa8 -WARNING: Pushing hg changeset 53a6a3bcd97028b50a158e99142cb99ffd4702b4 for 20ddff597f71180ec5003837acec746fa12991da +WARNING: Pushing hg changeset 78e60692c0956841b9977379be32279c0d7dc1d3 for 60e908952d6de8c3a23d51ebdfa852b6d4a805d7 +WARNING: Pushing hg changeset 33b6b40a8a37d686b61d9c6997cad3413e399ea7 for be71c59790f71082672848ae1bdf1ee6ecfe613e +WARNING: Pushing hg changeset 9257d109de0428812d9811b05381e50d5eca7414 for cf5c30a8f1882f70598b1c7646ac7c3285676560 +WARNING: Pushing hg changeset 18880f82f9fd0a940816e72d013fa213f95fcfd5 for 9ebbb830917c74b9add034f724669ea44eb670ab +WARNING: Pushing hg changeset c4f241364c2dbe4fed4aab02ed6ab03d23489d70 for 179c3e16a7864fe1ba00ab3a09361a7b738d6b0a To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..20ddff5 master -> master -WARNING: Pushing hg changeset 660b5a6d825c910942258eb4ca21fafc937c81e7 for 35846cb652e6982ebeae7af3ab4f4da91a993956 -WARNING: Pushing hg changeset c45d7baa7f5992fb2198183da9313b105e9f6e21 for 6df571b688e7e115c853405809c90d2ab5630e17 -WARNING: Pushing hg changeset 1378411f0695e563d29fe61a4afe0f96f19f4c01 for 4e6485b6d4ef23355ee483333ff41a7047834e70 -WARNING: Pushing hg changeset 534763a1c6b7a9068b2bcd52544a2c022f331ae6 for 576e5a72a2ea28a694160167aef15d4292539aa8 -WARNING: Pushing hg changeset 53a6a3bcd97028b50a158e99142cb99ffd4702b4 for 20ddff597f71180ec5003837acec746fa12991da + fffffff..179c3e1 master -> master +WARNING: Pushing hg changeset 78e60692c0956841b9977379be32279c0d7dc1d3 for 60e908952d6de8c3a23d51ebdfa852b6d4a805d7 +WARNING: Pushing hg changeset 33b6b40a8a37d686b61d9c6997cad3413e399ea7 for be71c59790f71082672848ae1bdf1ee6ecfe613e +WARNING: Pushing hg changeset 9257d109de0428812d9811b05381e50d5eca7414 for cf5c30a8f1882f70598b1c7646ac7c3285676560 +WARNING: Pushing hg changeset 18880f82f9fd0a940816e72d013fa213f95fcfd5 for 9ebbb830917c74b9add034f724669ea44eb670ab +WARNING: Pushing hg changeset c4f241364c2dbe4fed4aab02ed6ab03d23489d70 for 179c3e16a7864fe1ba00ab3a09361a7b738d6b0a ok 46 - check-hg-commits with push mode - no local proxy expecting success: @@ -6943,7 +7027,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 8f890fa95123 +new changesets 108eac61f50e progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -6963,32 +7047,32 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets 402888c5bae9:455fb163c4bd +new changesets 55d38e7bf3a2:ce9680052420 progress revision 1 'default' (0/5) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 3fb67a9..e645378 master -> origin/master - 3fb67a9..e645378 branches/default -> origin/branches/default -HEAD is now at e645378 restored + 8284e71..3e79eef master -> origin/master + 8284e71..3e79eef branches/default -> origin/branches/default +HEAD is now at 3e79eef 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 402888c5bae9a9f6ab0cd08106a02ea011fe8fc5 for d22aa8987f520657d1596a8114c020f0f3d6f249 -WARNING: Using hg changeset 5fd949bb3860b7f0b3f1ee2beaa056cba8a70e18 for d0ad1d699647ee2770e5deae84c0017261d45670 -WARNING: Using hg changeset 6be050b23276c2654670244a86dd6a0a4cf577c6 for 5bd463a04d27cbecd35b912ee9028bedca6d9c54 -WARNING: Using hg changeset 086a932c810876901eb19a1158cfc9e04a686008 for 5a72b510df058cdd73ac85ff1ce725f1c6aa1047 -WARNING: Using hg changeset 455fb163c4bd662d63377dfb04eec71dbbfb4fcc for e645378fe6cddeb72d1347560406b225950ead87 +WARNING: Using hg changeset 55d38e7bf3a21207a26a3fc35d0981704f6fd045 for 727d6bcd853b3cc693c84404e6cdd0a58e0bc9a1 +WARNING: Using hg changeset 2fc5c9755c7316d7b67af5929ceab219f0a2643b for 30bfe5fc2be407481aec2219498249f884cc9b39 +WARNING: Using hg changeset 85bc8ad969ac564d51eb1785d698a4e33aa4f71f for 4ba27a6e77a8b1c76c72e1463cc9934b0a4338c0 +WARNING: Using hg changeset cb3675653af3dc9fa9103fcf4598e26715532399 for c95ce3b386850401cd30e8fb64e97109cfe50564 +WARNING: Using hg changeset ce9680052420e491c0409040143ede722a564341 for 3e79eefa8da6f10ede6a4fe72eeaed515b0e5d77 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..e645378 master -> master -WARNING: Using hg changeset 402888c5bae9a9f6ab0cd08106a02ea011fe8fc5 for d22aa8987f520657d1596a8114c020f0f3d6f249 -WARNING: Using hg changeset 5fd949bb3860b7f0b3f1ee2beaa056cba8a70e18 for d0ad1d699647ee2770e5deae84c0017261d45670 -WARNING: Using hg changeset 6be050b23276c2654670244a86dd6a0a4cf577c6 for 5bd463a04d27cbecd35b912ee9028bedca6d9c54 -WARNING: Using hg changeset 086a932c810876901eb19a1158cfc9e04a686008 for 5a72b510df058cdd73ac85ff1ce725f1c6aa1047 -WARNING: Using hg changeset 455fb163c4bd662d63377dfb04eec71dbbfb4fcc for e645378fe6cddeb72d1347560406b225950ead87 + fffffff..3e79eef master -> master +WARNING: Using hg changeset 55d38e7bf3a21207a26a3fc35d0981704f6fd045 for 727d6bcd853b3cc693c84404e6cdd0a58e0bc9a1 +WARNING: Using hg changeset 2fc5c9755c7316d7b67af5929ceab219f0a2643b for 30bfe5fc2be407481aec2219498249f884cc9b39 +WARNING: Using hg changeset 85bc8ad969ac564d51eb1785d698a4e33aa4f71f for 4ba27a6e77a8b1c76c72e1463cc9934b0a4338c0 +WARNING: Using hg changeset cb3675653af3dc9fa9103fcf4598e26715532399 for c95ce3b386850401cd30e8fb64e97109cfe50564 +WARNING: Using hg changeset ce9680052420e491c0409040143ede722a564341 for 3e79eefa8da6f10ede6a4fe72eeaed515b0e5d77 ok 47 - check-hg-commits with push mode - with local proxy expecting success: @@ -7010,7 +7094,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 4b29f765a31f +new changesets da461bdc94fa 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 @@ -7020,23 +7104,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:10 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Jun 2 01:10 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:10 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 2 01:10 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 2 01:10 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Jul 4 07:37 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jul 4 07:37 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jul 4 07:37 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:10 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 2 01:10 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jul 4 07:37 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:10 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 2 01:10 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jul 4 07:37 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 refs ok 48 - shared-marks unset expecting success: @@ -7068,7 +7152,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 008d5ce5a0e6 +new changesets 33a393cfaa85 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 @@ -7078,23 +7162,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:10 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Jun 2 01:10 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:10 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 2 01:10 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 2 01:10 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Jul 4 07:37 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jul 4 07:37 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jul 4 07:37 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:10 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 2 01:10 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jul 4 07:37 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:10 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 2 01:10 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jul 4 07:37 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 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 @@ -7116,25 +7200,25 @@ progress revision walk 'branches/default' (0/0) progress revision 0 'default' (0/1) total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 2 01:10 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Jun 2 01:10 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:10 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 2 01:10 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 2 01:10 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jul 4 07:37 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Jul 4 07:37 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jul 4 07:37 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jul 4 07:37 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 2 01:10 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 2 01:10 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 2 01:10 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 2 01:10 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 2 01:10 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jul 4 07:37 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jul 4 07:37 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jul 4 07:37 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jul 4 07:37 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jul 4 07:37 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 2 01:10 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 2 01:10 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 2 01:10 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 2 01:10 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 2 01:10 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:10 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jul 4 07:37 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jul 4 07:37 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jul 4 07:37 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jul 4 07:37 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jul 4 07:37 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 refs ok 49 - shared-marks set to unset expecting success: @@ -7175,7 +7259,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets a894ee996e08 +new changesets 5c21c17a901a 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 @@ -7187,70 +7271,70 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 2 01:11 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Jun 2 01:11 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:11 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 2 01:11 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 2 01:11 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jul 4 07:37 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Jul 4 07:37 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jul 4 07:37 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jul 4 07:37 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 2 01:11 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 2 01:11 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 2 01:11 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 2 01:11 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 2 01:11 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:11 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jul 4 07:37 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jul 4 07:37 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jul 4 07:37 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jul 4 07:37 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jul 4 07:37 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 2 01:11 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 2 01:11 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 2 01:11 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 2 01:11 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 2 01:11 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:11 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jul 4 07:37 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jul 4 07:37 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jul 4 07:37 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jul 4 07:37 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jul 4 07:37 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 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 Jun 2 01:11 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Jun 2 01:11 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:11 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 2 01:11 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 2 01:11 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jul 4 07:37 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Jul 4 07:37 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jul 4 07:37 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jul 4 07:37 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 2 01:11 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 2 01:11 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 2 01:11 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 2 01:11 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 2 01:11 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:11 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jul 4 07:37 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jul 4 07:37 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jul 4 07:37 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jul 4 07:37 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jul 4 07:37 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Jun 2 01:11 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Jun 2 01:11 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 2 01:11 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 2 01:11 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 2 01:11 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:11 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jul 4 07:37 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jul 4 07:37 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jul 4 07:37 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jul 4 07:37 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jul 4 07:37 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 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 Jun 2 01:11 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Jun 2 01:11 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:11 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 2 01:11 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 2 01:11 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:11 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:11 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Jul 4 07:37 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jul 4 07:37 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jul 4 07:37 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:11 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:11 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 2 01:11 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:11 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jul 4 07:37 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:11 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Jun 2 01:11 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Jun 2 01:11 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Jun 2 01:11 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jul 4 07:37 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jul 4 07:37 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jul 4 07:37 refs ok 50 - shared-marks unset to set expecting success: @@ -7299,7 +7383,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: @@ -7370,7 +7454,7 @@ debian/rules override_dh_auto_install make[1]: Entering directory '/build/git-remote-hg-1.0.4~ds' dh_auto_install -- prefix=/usr install-doc - make -j15 install DESTDIR=/build/git-remote-hg-1.0.4\~ds/debian/git-remote-hg AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" prefix=/usr install-doc + make -j16 install DESTDIR=/build/git-remote-hg-1.0.4\~ds/debian/git-remote-hg AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" prefix=/usr install-doc make[2]: Entering directory '/build/git-remote-hg-1.0.4~ds' if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then \ : Use chosen Python version ; \ @@ -7422,12 +7506,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/3875776/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/3875776/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/2383504 and its subdirectories -I: Current time: Thu Jun 1 13:11:47 -12 2023 -I: pbuilder-time-stamp: 1685668307 +I: removing directory /srv/workspace/pbuilder/3875776 and its subdirectories +I: Current time: Thu Jul 4 21:38:00 +14 2024 +I: pbuilder-time-stamp: 1720078680