Diff of the two buildlogs: -- --- b1/build.log 2022-08-30 20:41:15.871315504 +0000 +++ b2/build.log 2022-08-30 20:50:30.426543319 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Mon Oct 2 14:59:46 -12 2023 -I: pbuilder-time-stamp: 1696301986 +I: Current time: Wed Aug 31 10:41:18 +14 2022 +I: pbuilder-time-stamp: 1661892078 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/buster-reproducible-base.tgz] I: copying local configuration @@ -17,7 +17,7 @@ I: Extracting source gpgv: unknown type of key resource 'trustedkeys.kbx' gpgv: keyblock resource '/root/.gnupg/trustedkeys.kbx': General error -gpgv: Signature made Fri Nov 2 06:30:02 2018 -12 +gpgv: Signature made Sat Nov 3 08:30:02 2018 +14 gpgv: using RSA key 73B299CBD4EEADDCC017E87A5BFFDCC258E69433 gpgv: issuer "jspricke@debian.org" gpgv: Can't check signature: No public key @@ -29,136 +29,171 @@ dpkg-source: info: applying 0001-Fix-Disable-unit-tests.patch I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/1297525/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/1502946/tmp/hooks/D01_modify_environment starting +debug: Running on ionos1-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 +Removing 'diversion of /bin/sh to /bin/sh.distrib by dash' +Adding 'diversion of /bin/sh to /bin/sh.distrib by bash' +Removing 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by dash' +Adding 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by bash' +lrwxrwxrwx 1 root root 4 Aug 31 10:41 /bin/sh -> 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/1502946/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/1502946/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=16' - DISTRIBUTION='' - HOME='/root' - HOST_ARCH='amd64' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="0" [2]="3" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu") + BASH_VERSION='5.0.3(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=15' + DIRSTACK=() + DISTRIBUTION= + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=x86_64 + HOST_ARCH=amd64 IFS=' ' - INVOCATION_ID='f87a148a71d54072ae05d284ad61c6dd' - 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='1297525' - PS1='# ' - PS2='> ' + INVOCATION_ID=3fead099a6d644dcbef2387c27a6c155 + 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=1502946 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/tmp.2C9hafe1tP/pbuilderrc_xxjy --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.2C9hafe1tP/b1 --logfile b1/build.log ros-vcstools_0.1.40-2.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://85.184.249.68: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/tmp.2C9hafe1tP/pbuilderrc_IohD --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.2C9hafe1tP/b2 --logfile b2/build.log ros-vcstools_0.1.40-2.dsc' + SUDO_GID=110 + SUDO_UID=105 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://78.137.99.97:3128 I: uname -a - Linux ionos5-amd64 5.18.0-0.deb11.3-amd64 #1 SMP PREEMPT_DYNAMIC Debian 5.18.14-1~bpo11+1 (2022-07-28) x86_64 GNU/Linux + Linux i-capture-the-hostname 5.10.0-17-amd64 #1 SMP Debian 5.10.136-1 (2022-08-13) x86_64 GNU/Linux I: ls -l /bin total 5116 - -rwxr-xr-x 1 root root 1168776 Apr 17 2019 bash - -rwxr-xr-x 3 root root 38984 Jul 10 2019 bunzip2 - -rwxr-xr-x 3 root root 38984 Jul 10 2019 bzcat - lrwxrwxrwx 1 root root 6 Jul 10 2019 bzcmp -> bzdiff - -rwxr-xr-x 1 root root 2227 Jul 10 2019 bzdiff - lrwxrwxrwx 1 root root 6 Jul 10 2019 bzegrep -> bzgrep - -rwxr-xr-x 1 root root 4877 Jun 24 2019 bzexe - lrwxrwxrwx 1 root root 6 Jul 10 2019 bzfgrep -> bzgrep - -rwxr-xr-x 1 root root 3641 Jul 10 2019 bzgrep - -rwxr-xr-x 3 root root 38984 Jul 10 2019 bzip2 - -rwxr-xr-x 1 root root 14328 Jul 10 2019 bzip2recover - lrwxrwxrwx 1 root root 6 Jul 10 2019 bzless -> bzmore - -rwxr-xr-x 1 root root 1297 Jul 10 2019 bzmore - -rwxr-xr-x 1 root root 43744 Feb 28 2019 cat - -rwxr-xr-x 1 root root 64320 Feb 28 2019 chgrp - -rwxr-xr-x 1 root root 64288 Feb 28 2019 chmod - -rwxr-xr-x 1 root root 72512 Feb 28 2019 chown - -rwxr-xr-x 1 root root 146880 Feb 28 2019 cp - -rwxr-xr-x 1 root root 121464 Jan 17 2019 dash - -rwxr-xr-x 1 root root 109408 Feb 28 2019 date - -rwxr-xr-x 1 root root 76712 Feb 28 2019 dd - -rwxr-xr-x 1 root root 93744 Feb 28 2019 df - -rwxr-xr-x 1 root root 138856 Feb 28 2019 dir - -rwxr-xr-x 1 root root 84288 Jan 9 2019 dmesg - lrwxrwxrwx 1 root root 8 Sep 26 2018 dnsdomainname -> hostname - lrwxrwxrwx 1 root root 8 Sep 26 2018 domainname -> hostname - -rwxr-xr-x 1 root root 39520 Feb 28 2019 echo - -rwxr-xr-x 1 root root 28 Jan 7 2019 egrep - -rwxr-xr-x 1 root root 35424 Feb 28 2019 false - -rwxr-xr-x 1 root root 28 Jan 7 2019 fgrep - -rwxr-xr-x 1 root root 68880 Jan 9 2019 findmnt - -rwsr-xr-x 1 root root 34896 Apr 22 2020 fusermount - -rwxr-xr-x 1 root root 198976 Jan 7 2019 grep - -rwxr-xr-x 2 root root 2345 Jan 5 2019 gunzip - -rwxr-xr-x 1 root root 6375 Jan 5 2019 gzexe - -rwxr-xr-x 1 root root 98048 Jan 5 2019 gzip - -rwxr-xr-x 1 root root 26696 Sep 26 2018 hostname - -rwxr-xr-x 1 root root 68552 Feb 28 2019 ln - -rwxr-xr-x 1 root root 56760 Jul 26 2018 login - -rwxr-xr-x 1 root root 138856 Feb 28 2019 ls - -rwxr-xr-x 1 root root 108624 Jan 9 2019 lsblk - -rwxr-xr-x 1 root root 89088 Feb 28 2019 mkdir - -rwxr-xr-x 1 root root 68544 Feb 28 2019 mknod - -rwxr-xr-x 1 root root 43808 Feb 28 2019 mktemp - -rwxr-xr-x 1 root root 43008 Jan 9 2019 more - -rwsr-xr-x 1 root root 51280 Jan 9 2019 mount - -rwxr-xr-x 1 root root 14408 Jan 9 2019 mountpoint - -rwxr-xr-x 1 root root 138728 Feb 28 2019 mv - lrwxrwxrwx 1 root root 8 Sep 26 2018 nisdomainname -> hostname - lrwxrwxrwx 1 root root 14 Feb 14 2019 pidof -> /sbin/killall5 - -rwxr-xr-x 1 root root 39616 Feb 28 2019 pwd - lrwxrwxrwx 1 root root 4 Apr 17 2019 rbash -> bash - -rwxr-xr-x 1 root root 47776 Feb 28 2019 readlink - -rwxr-xr-x 1 root root 68416 Feb 28 2019 rm - -rwxr-xr-x 1 root root 47776 Feb 28 2019 rmdir - -rwxr-xr-x 1 root root 23312 Jan 21 2019 run-parts - -rwxr-xr-x 1 root root 122224 Dec 22 2018 sed - lrwxrwxrwx 1 root root 4 Sep 9 02:47 sh -> dash - -rwxr-xr-x 1 root root 39552 Feb 28 2019 sleep - -rwxr-xr-x 1 root root 80672 Feb 28 2019 stty - -rwsr-xr-x 1 root root 63568 Jan 9 2019 su - -rwxr-xr-x 1 root root 35488 Feb 28 2019 sync - -rwxr-xr-x 1 root root 445560 Apr 23 2019 tar - -rwxr-xr-x 1 root root 14440 Jan 21 2019 tempfile - -rwxr-xr-x 1 root root 97152 Feb 28 2019 touch - -rwxr-xr-x 1 root root 35424 Feb 28 2019 true - -rwxr-xr-x 1 root root 14328 Apr 22 2020 ulockmgr_server - -rwsr-xr-x 1 root root 34888 Jan 9 2019 umount - -rwxr-xr-x 1 root root 39584 Feb 28 2019 uname - -rwxr-xr-x 2 root root 2345 Jan 5 2019 uncompress - -rwxr-xr-x 1 root root 138856 Feb 28 2019 vdir - -rwxr-xr-x 1 root root 34896 Jan 9 2019 wdctl - -rwxr-xr-x 1 root root 946 Jan 21 2019 which - lrwxrwxrwx 1 root root 8 Sep 26 2018 ypdomainname -> hostname - -rwxr-xr-x 1 root root 1983 Jan 5 2019 zcat - -rwxr-xr-x 1 root root 1677 Jan 5 2019 zcmp - -rwxr-xr-x 1 root root 5879 Jan 5 2019 zdiff - -rwxr-xr-x 1 root root 29 Jan 5 2019 zegrep - -rwxr-xr-x 1 root root 29 Jan 5 2019 zfgrep - -rwxr-xr-x 1 root root 2080 Jan 5 2019 zforce - -rwxr-xr-x 1 root root 7584 Jan 5 2019 zgrep - -rwxr-xr-x 1 root root 2205 Jan 5 2019 zless - -rwxr-xr-x 1 root root 1841 Jan 5 2019 zmore - -rwxr-xr-x 1 root root 4552 Jan 5 2019 znew -I: user script /srv/workspace/pbuilder/1297525/tmp/hooks/D02_print_environment finished + -rwxr-xr-x 1 root root 1168776 Apr 18 2019 bash + -rwxr-xr-x 3 root root 38984 Jul 11 2019 bunzip2 + -rwxr-xr-x 3 root root 38984 Jul 11 2019 bzcat + lrwxrwxrwx 1 root root 6 Jul 11 2019 bzcmp -> bzdiff + -rwxr-xr-x 1 root root 2227 Jul 11 2019 bzdiff + lrwxrwxrwx 1 root root 6 Jul 11 2019 bzegrep -> bzgrep + -rwxr-xr-x 1 root root 4877 Jun 25 2019 bzexe + lrwxrwxrwx 1 root root 6 Jul 11 2019 bzfgrep -> bzgrep + -rwxr-xr-x 1 root root 3641 Jul 11 2019 bzgrep + -rwxr-xr-x 3 root root 38984 Jul 11 2019 bzip2 + -rwxr-xr-x 1 root root 14328 Jul 11 2019 bzip2recover + lrwxrwxrwx 1 root root 6 Jul 11 2019 bzless -> bzmore + -rwxr-xr-x 1 root root 1297 Jul 11 2019 bzmore + -rwxr-xr-x 1 root root 43744 Mar 1 2019 cat + -rwxr-xr-x 1 root root 64320 Mar 1 2019 chgrp + -rwxr-xr-x 1 root root 64288 Mar 1 2019 chmod + -rwxr-xr-x 1 root root 72512 Mar 1 2019 chown + -rwxr-xr-x 1 root root 146880 Mar 1 2019 cp + -rwxr-xr-x 1 root root 121464 Jan 18 2019 dash + -rwxr-xr-x 1 root root 109408 Mar 1 2019 date + -rwxr-xr-x 1 root root 76712 Mar 1 2019 dd + -rwxr-xr-x 1 root root 93744 Mar 1 2019 df + -rwxr-xr-x 1 root root 138856 Mar 1 2019 dir + -rwxr-xr-x 1 root root 84288 Jan 10 2019 dmesg + lrwxrwxrwx 1 root root 8 Sep 27 2018 dnsdomainname -> hostname + lrwxrwxrwx 1 root root 8 Sep 27 2018 domainname -> hostname + -rwxr-xr-x 1 root root 39520 Mar 1 2019 echo + -rwxr-xr-x 1 root root 28 Jan 8 2019 egrep + -rwxr-xr-x 1 root root 35424 Mar 1 2019 false + -rwxr-xr-x 1 root root 28 Jan 8 2019 fgrep + -rwxr-xr-x 1 root root 68880 Jan 10 2019 findmnt + -rwsr-xr-x 1 root root 34896 Apr 23 2020 fusermount + -rwxr-xr-x 1 root root 198976 Jan 8 2019 grep + -rwxr-xr-x 2 root root 2345 Jan 6 2019 gunzip + -rwxr-xr-x 1 root root 6375 Jan 6 2019 gzexe + -rwxr-xr-x 1 root root 98048 Jan 6 2019 gzip + -rwxr-xr-x 1 root root 26696 Sep 27 2018 hostname + -rwxr-xr-x 1 root root 68552 Mar 1 2019 ln + -rwxr-xr-x 1 root root 56760 Jul 27 2018 login + -rwxr-xr-x 1 root root 138856 Mar 1 2019 ls + -rwxr-xr-x 1 root root 108624 Jan 10 2019 lsblk + -rwxr-xr-x 1 root root 89088 Mar 1 2019 mkdir + -rwxr-xr-x 1 root root 68544 Mar 1 2019 mknod + -rwxr-xr-x 1 root root 43808 Mar 1 2019 mktemp + -rwxr-xr-x 1 root root 43008 Jan 10 2019 more + -rwsr-xr-x 1 root root 51280 Jan 10 2019 mount + -rwxr-xr-x 1 root root 14408 Jan 10 2019 mountpoint + -rwxr-xr-x 1 root root 138728 Mar 1 2019 mv + lrwxrwxrwx 1 root root 8 Sep 27 2018 nisdomainname -> hostname + lrwxrwxrwx 1 root root 14 Feb 15 2019 pidof -> /sbin/killall5 + -rwxr-xr-x 1 root root 39616 Mar 1 2019 pwd + lrwxrwxrwx 1 root root 4 Apr 18 2019 rbash -> bash + -rwxr-xr-x 1 root root 47776 Mar 1 2019 readlink + -rwxr-xr-x 1 root root 68416 Mar 1 2019 rm + -rwxr-xr-x 1 root root 47776 Mar 1 2019 rmdir + -rwxr-xr-x 1 root root 23312 Jan 22 2019 run-parts + -rwxr-xr-x 1 root root 122224 Dec 23 2018 sed + lrwxrwxrwx 1 root root 4 Aug 31 10:41 sh -> bash + lrwxrwxrwx 1 root root 4 Aug 7 22:25 sh.distrib -> dash + -rwxr-xr-x 1 root root 39552 Mar 1 2019 sleep + -rwxr-xr-x 1 root root 80672 Mar 1 2019 stty + -rwsr-xr-x 1 root root 63568 Jan 10 2019 su + -rwxr-xr-x 1 root root 35488 Mar 1 2019 sync + -rwxr-xr-x 1 root root 445560 Apr 24 2019 tar + -rwxr-xr-x 1 root root 14440 Jan 22 2019 tempfile + -rwxr-xr-x 1 root root 97152 Mar 1 2019 touch + -rwxr-xr-x 1 root root 35424 Mar 1 2019 true + -rwxr-xr-x 1 root root 14328 Apr 23 2020 ulockmgr_server + -rwsr-xr-x 1 root root 34888 Jan 10 2019 umount + -rwxr-xr-x 1 root root 39584 Mar 1 2019 uname + -rwxr-xr-x 2 root root 2345 Jan 6 2019 uncompress + -rwxr-xr-x 1 root root 138856 Mar 1 2019 vdir + -rwxr-xr-x 1 root root 34896 Jan 10 2019 wdctl + -rwxr-xr-x 1 root root 946 Jan 22 2019 which + lrwxrwxrwx 1 root root 8 Sep 27 2018 ypdomainname -> hostname + -rwxr-xr-x 1 root root 1983 Jan 6 2019 zcat + -rwxr-xr-x 1 root root 1677 Jan 6 2019 zcmp + -rwxr-xr-x 1 root root 5879 Jan 6 2019 zdiff + -rwxr-xr-x 1 root root 29 Jan 6 2019 zegrep + -rwxr-xr-x 1 root root 29 Jan 6 2019 zfgrep + -rwxr-xr-x 1 root root 2080 Jan 6 2019 zforce + -rwxr-xr-x 1 root root 7584 Jan 6 2019 zgrep + -rwxr-xr-x 1 root root 2205 Jan 6 2019 zless + -rwxr-xr-x 1 root root 1841 Jan 6 2019 zmore + -rwxr-xr-x 1 root root 4552 Jan 6 2019 znew +I: user script /srv/workspace/pbuilder/1502946/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -338,7 +373,7 @@ Get: 107 http://deb.debian.org/debian buster/main amd64 python3-nose all 1.3.7-4 [132 kB] Get: 108 http://deb.debian.org/debian buster/main amd64 python3-yaml amd64 3.13-2 [121 kB] Get: 109 http://deb.debian.org/debian buster/main amd64 subversion amd64 1.10.4-1+deb10u2 [1008 kB] -Fetched 48.8 MB in 1s (65.9 MB/s) +Fetched 48.8 MB in 1s (37.1 MB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libbsd0: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 ... 19195 files and directories currently installed.) @@ -802,7 +837,8 @@ Building tag database... -> Finished parsing the build-deps I: Building the package -I: Running cd /build/ros-vcstools-0.1.40/ && 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 > ../ros-vcstools_0.1.40-2_source.changes +hostname: Name or service not known +I: Running cd /build/ros-vcstools-0.1.40/ && 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 > ../ros-vcstools_0.1.40-2_source.changes dpkg-buildpackage: info: source package ros-vcstools dpkg-buildpackage: info: source version 0.1.40-2 dpkg-buildpackage: info: source distribution unstable @@ -872,11 +908,11 @@ test_sanitized (test.test_base.BaseTest) ... ok test_shell_command (test.test_base.BaseTest) ... WARNING [vcstools] Command failed: '[' errcode: 2: -/bin/sh: 1: [: missing ] +/bin/sh: line 0: [: missing `]' [/vcstools] WARNING [vcstools] Command failed: 'echo foo && [' errcode: 2: -/bin/sh: 1: [: missing ] +/bin/sh: line 0: [: missing `]' [/vcstools] ERROR [vcstools] Command failed with OSError. 'two words' : [Errno 2] No such file or directory[/vcstools] @@ -886,82 +922,82 @@ test_urlretrieve_netrc (test.test_base.BaseTest) ... ok Created a standalone tree (format: 2a) adding fixed.txt -Committing to: /tmp/tmpkjnlwM/remote/ +Committing to: /tmp/tmp6gHEGV/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmpkjnlwM/remote/ +Committing to: /tmp/tmp6gHEGV/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpkjnlwM/remote/ +Committing to: /tmp/tmp6gHEGV/remote/ added deleted-fs.txt added deleted.txt Committed revision 3. -test_get_log_defaults (test.test_bzr.BzrClientAffectedFilesTest) ... ERROR [vcstools] Can't remove /tmp/tmpkjnlwM/local[/vcstools] +test_get_log_defaults (test.test_bzr.BzrClientAffectedFilesTest) ... ERROR [vcstools] Can't remove /tmp/tmp6gHEGV/local[/vcstools] ok Created a standalone tree (format: 2a) adding fixed.txt -Committing to: /tmp/tmpXV4hbN/remote/ +Committing to: /tmp/tmpVMPAug/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmpXV4hbN/remote/ +Committing to: /tmp/tmpVMPAug/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpXV4hbN/remote/ +Committing to: /tmp/tmpVMPAug/remote/ added deleted-fs.txt added deleted.txt Committed revision 3. -test_get_log_defaults (test.test_bzr.BzrClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmpXV4hbN/local[/vcstools] +test_get_log_defaults (test.test_bzr.BzrClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmpVMPAug/local[/vcstools] ok test_get_log_limit (test.test_bzr.BzrClientLogTest) ... ok test_get_log_path (test.test_bzr.BzrClientLogTest) ... ok Created a standalone tree (format: 2a) adding fixed.txt -Committing to: /tmp/tmpotThcp/remote/ +Committing to: /tmp/tmpEvJ8XZ/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmpotThcp/remote/ +Committing to: /tmp/tmpEvJ8XZ/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpotThcp/remote/ +Committing to: /tmp/tmpEvJ8XZ/remote/ added deleted-fs.txt added deleted.txt Committed revision 3. testDiffClean (test.test_bzr.BzrClientTest) ... ok testStatusClean (test.test_bzr.BzrClientTest) ... ok test_checkout (test.test_bzr.BzrClientTest) ... ok -test_checkout_dir_exists (test.test_bzr.BzrClientTest) ... ERROR [vcstools] Can't remove /tmp/tmpotThcp/local[/vcstools] +test_checkout_dir_exists (test.test_bzr.BzrClientTest) ... ERROR [vcstools] Can't remove /tmp/tmpEvJ8XZ/local[/vcstools] ok -makes sure failed checkout results in False, not Exception ... WARNING [vcstools] Command failed: 'bzr branch /tmp/tmpotThcp/remotefoobar /tmp/tmpotThcp/local' +makes sure failed checkout results in False, not Exception ... WARNING [vcstools] Command failed: 'bzr branch /tmp/tmpEvJ8XZ/remotefoobar /tmp/tmpEvJ8XZ/local' errcode: 3: -bzr: ERROR: Not a branch: "/tmp/tmpotThcp/remotefoobar/". +bzr: ERROR: Not a branch: "/tmp/tmpEvJ8XZ/remotefoobar/". [/vcstools] -ERROR [vcstools] Command failed: 'bzr branch /tmp/tmpotThcp/remotefoobar /tmp/tmpotThcp/local' +ERROR [vcstools] Command failed: 'bzr branch /tmp/tmpEvJ8XZ/remotefoobar /tmp/tmpEvJ8XZ/local' errcode: 3: -bzr: ERROR: Not a branch: "/tmp/tmpotThcp/remotefoobar/". +bzr: ERROR: Not a branch: "/tmp/tmpEvJ8XZ/remotefoobar/". [/vcstools] ok makes sure no exception happens on invalid update ... WARNING [vcstools] Command failed: 'bzr update -r foobar' - run at: '/tmp/tmpotThcp/local' + run at: '/tmp/tmpEvJ8XZ/local' errcode: 3: -bzr: ERROR: Requested revision: 'foobar' does not exist in branch: file:///tmp/tmpotThcp/local/ +bzr: ERROR: Requested revision: 'foobar' does not exist in branch: file:///tmp/tmpEvJ8XZ/local/ [/vcstools] ok test_checkout_specific_version_and_update (test.test_bzr.BzrClientTest) ... ok @@ -974,71 +1010,71 @@ test_url_matches_with_shortcut_strings_slashes (test.test_bzr.BzrClientTest) ... ok Created a standalone tree (format: 2a) adding fixed.txt -Committing to: /tmp/tmp52U4C3/remote/ +Committing to: /tmp/tmpWd21cz/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmp52U4C3/remote/ +Committing to: /tmp/tmpWd21cz/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmp52U4C3/remote/ +Committing to: /tmp/tmpWd21cz/remote/ added deleted-fs.txt added deleted.txt Committed revision 3. test_export_repository (test.test_bzr.BzrDiffStatClientTest) ... ok Test source code for PEP8 conformance ... ok -Initialized empty Git repository in /tmp/tmpVeqgn5/remote/.git/ -[master (root-commit) c792c43] initial +Initialized empty Git repository in /tmp/tmpk9594E/remote/.git/ +[master (root-commit) 28ec546] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 815f387] initial +[master 56743ed] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 071ec54] modified +[master 1bc179b] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt -test_get_affected_files (test.test_git.GitClientAffectedFiles) ... Cloning into '/tmp/tmpVeqgn5/ros'... +test_get_affected_files (test.test_git.GitClientAffectedFiles) ... Cloning into '/tmp/tmpk9594E/ros'... done. Switched to a new branch 'localbranch' -[localbranch b3bf020] local_file +[localbranch a6704a9] local_file Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_file ok -Initialized empty Git repository in /tmp/tmpIjzzRQ/remote/.git/ -[master (root-commit) 57d60e7] initial +Initialized empty Git repository in /tmp/tmpxZAiTg/remote/.git/ +[master (root-commit) 28ec546] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 9d0e0ca] initial +[master 56743ed] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master efc30eb] modified +[master 51efe3c] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt -test_checkout_untracked_branch_and_update (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpIjzzRQ/ros'... +test_checkout_untracked_branch_and_update (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpxZAiTg/ros'... done. Switched to a new branch 'localbranch' -[localbranch 8548801] my_branch +[localbranch e245739] my_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local.txt Switched to a new branch 'diverged_branch' -[diverged_branch ff27574] diverged_branch +[diverged_branch b94c0cd] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -1053,48 +1089,48 @@ git checkout -b -HEAD is now at 57d60e7 initial -[detached HEAD b63d8ac] no_branch +HEAD is now at 28ec546 initial +[detached HEAD bbdebef] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD d8afe3a] dangling +[detached HEAD 79ea0bc] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD fc4bbf0] dangling_tip +[detached HEAD 70542e8] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was fc4bbf0). +Deleted branch oldbranch (was 70542e8). Warning: you are leaving 2 commits behind, not connected to any of your branches: - fc4bbf0 dangling_tip - d8afe3a dangling + 70542e8 dangling_tip + 79ea0bc dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch fc4bbf0 + git branch 70542e8 Switched to branch 'master' Your branch is up to date with 'origin/master'. vcstools only handles branches tracking default remote, branch 'master' tracks remote 'None' WARNING [vcstools] vcstools only handles branches tracking default remote, branch 'localbranch' tracks remote 'None'. -Repository path is '/tmp/tmpIjzzRQ/ros'.[/vcstools] +Repository path is '/tmp/tmpxZAiTg/ros'.[/vcstools] vcstools only handles branches tracking default remote, branch 'master' tracks remote 'None' vcstools refusing to move away from dangling commit, to protect your work. ok -test_detached_to_branch (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpIjzzRQ/ros'... +test_detached_to_branch (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpxZAiTg/ros'... done. Switched to a new branch 'localbranch' -[localbranch 3359713] my_branch +[localbranch 4947078] my_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local.txt Switched to a new branch 'diverged_branch' -[diverged_branch 69ad009] diverged_branch +[diverged_branch a1d1f4d] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -1109,43 +1145,43 @@ git checkout -b -HEAD is now at 57d60e7 initial -[detached HEAD e86c8af] no_branch +HEAD is now at 28ec546 initial +[detached HEAD e80b597] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD b2a1b24] dangling +[detached HEAD acd2085] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 6bc2d7b] dangling_tip +[detached HEAD 8384925] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 6bc2d7b). +Deleted branch oldbranch (was 8384925). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 6bc2d7b dangling_tip - b2a1b24 dangling + 8384925 dangling_tip + acd2085 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 6bc2d7b + git branch 8384925 Switched to branch 'master' Your branch is up to date with 'origin/master'. ok -test_inject_protection (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpIjzzRQ/ros'... +test_inject_protection (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpxZAiTg/ros'... done. Switched to a new branch 'localbranch' -[localbranch 682046a] my_branch +[localbranch e26a824] my_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local.txt Switched to a new branch 'diverged_branch' -[diverged_branch d16cb64] diverged_branch +[diverged_branch a9810de] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -1160,43 +1196,43 @@ git checkout -b -HEAD is now at 57d60e7 initial -[detached HEAD 61f0612] no_branch +HEAD is now at 28ec546 initial +[detached HEAD db62d8b] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD e7ae69c] dangling +[detached HEAD 55dff80] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 2a8f871] dangling_tip +[detached HEAD f4aa0ac] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 2a8f871). +Deleted branch oldbranch (was f4aa0ac). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 2a8f871 dangling_tip - e7ae69c dangling + f4aa0ac dangling_tip + 55dff80 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 2a8f871 + git branch f4aa0ac Switched to branch 'master' Your branch is up to date with 'origin/master'. ok -test_is_commit_in_orphaned_subtree (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpIjzzRQ/ros'... +test_is_commit_in_orphaned_subtree (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpxZAiTg/ros'... done. Switched to a new branch 'localbranch' -[localbranch 682046a] my_branch +[localbranch e26a824] my_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local.txt Switched to a new branch 'diverged_branch' -[diverged_branch d16cb64] diverged_branch +[diverged_branch a9810de] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -1211,43 +1247,43 @@ git checkout -b -HEAD is now at 57d60e7 initial -[detached HEAD 61f0612] no_branch +HEAD is now at 28ec546 initial +[detached HEAD 4228a4a] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD e7ae69c] dangling +[detached HEAD 521c5b4] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 2a8f871] dangling_tip +[detached HEAD ab6b822] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 2a8f871). +Deleted branch oldbranch (was ab6b822). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 2a8f871 dangling_tip - e7ae69c dangling + ab6b822 dangling_tip + 521c5b4 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 2a8f871 + git branch ab6b822 Switched to branch 'master' Your branch is up to date with 'origin/master'. ok -test_protect_dangling (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpIjzzRQ/ros'... +test_protect_dangling (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpxZAiTg/ros'... done. Switched to a new branch 'localbranch' -[localbranch d67648b] my_branch +[localbranch a1abc61] my_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local.txt Switched to a new branch 'diverged_branch' -[diverged_branch e0844d8] diverged_branch +[diverged_branch 6e5c6d5] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -1262,198 +1298,198 @@ git checkout -b -HEAD is now at 57d60e7 initial -[detached HEAD 7070737] no_branch +HEAD is now at 28ec546 initial +[detached HEAD b3bc868] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD f1d9d00] dangling +[detached HEAD 3e47d92] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 2a1cbbe] dangling_tip +[detached HEAD ce71732] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 2a1cbbe). +Deleted branch oldbranch (was ce71732). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 2a1cbbe dangling_tip - f1d9d00 dangling + ce71732 dangling_tip + 3e47d92 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 2a1cbbe + git branch ce71732 Switched to branch 'master' Your branch is up to date with 'origin/master'. vcstools refusing to move away from dangling commit, to protect your work. ok -Initialized empty Git repository in /tmp/tmpunCq03/remote/.git/ -[master (root-commit) 0ce67c3] initial +Initialized empty Git repository in /tmp/tmpOAxiOI/remote/.git/ +[master (root-commit) 8beb12f] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master cbcd73d] initial +[master 7047f3b] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 9d733fa] modified +[master 8d333f7] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt -test_get_log_defaults (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmpunCq03/ros'... +test_get_log_defaults (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmpOAxiOI/ros'... done. Switched to a new branch 'localbranch' -[localbranch c886c4f] local_0 +[localbranch 51e6b3e] local_0 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_0.txt -[localbranch bef5502] local_1 +[localbranch 91a6b24] local_1 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_1.txt -[localbranch eda975f] local_2 +[localbranch b601cf6] local_2 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_2.txt -[localbranch 973c813] local_3 +[localbranch 10edba6] local_3 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_3.txt -[localbranch 6756a03] local_4 +[localbranch 7933c5d] local_4 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_4.txt -[localbranch 4dd8b08] local_5 +[localbranch 6808f63] local_5 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_5.txt -[localbranch 16bbdae] local_6 +[localbranch 6d57e2d] local_6 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_6.txt -[localbranch fe097f6] local_7 +[localbranch 90cc395] local_7 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_7.txt -[localbranch c45ec44] local_8 +[localbranch 689bee7] local_8 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_8.txt -[localbranch 1212376] local_9 +[localbranch 1262251] local_9 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_9.txt ok -test_get_log_limit (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmpunCq03/ros'... +test_get_log_limit (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmpOAxiOI/ros'... done. Switched to a new branch 'localbranch' -[localbranch c886c4f] local_0 +[localbranch 3b1abd0] local_0 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_0.txt -[localbranch bef5502] local_1 +[localbranch e30e146] local_1 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_1.txt -[localbranch eda975f] local_2 +[localbranch 79ca8c9] local_2 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_2.txt -[localbranch 973c813] local_3 +[localbranch 41754ae] local_3 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_3.txt -[localbranch 6756a03] local_4 +[localbranch 6261755] local_4 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_4.txt -[localbranch 4dd8b08] local_5 +[localbranch ff64c79] local_5 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_5.txt -[localbranch 16bbdae] local_6 +[localbranch 0a90907] local_6 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_6.txt -[localbranch fe097f6] local_7 +[localbranch 292be39] local_7 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_7.txt -[localbranch c45ec44] local_8 +[localbranch 09ec3f0] local_8 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_8.txt -[localbranch 1212376] local_9 +[localbranch c2792f4] local_9 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_9.txt ok -test_get_log_path (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmpunCq03/ros'... +test_get_log_path (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmpOAxiOI/ros'... done. Switched to a new branch 'localbranch' -[localbranch 3138ce5] local_0 +[localbranch 74be7b3] local_0 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_0.txt -[localbranch cf32e83] local_1 +[localbranch cf7d549] local_1 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_1.txt -[localbranch 647de16] local_2 +[localbranch 6ec5567] local_2 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_2.txt -[localbranch bacb957] local_3 +[localbranch 3232bdb] local_3 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_3.txt -[localbranch 3374260] local_4 +[localbranch eb37674] local_4 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_4.txt -[localbranch d49f616] local_5 +[localbranch 223243e] local_5 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_5.txt -[localbranch a66cf46] local_6 +[localbranch af442a8] local_6 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_6.txt -[localbranch 9865604] local_7 +[localbranch cf2beab] local_7 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_7.txt -[localbranch 8be3728] local_8 +[localbranch 92276ea] local_8 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_8.txt -[localbranch 3259c33] local_9 +[localbranch be17934] local_9 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_9.txt ok -Initialized empty Git repository in /tmp/tmp5ljETC/remote/.git/ -[master (root-commit) 1fc476f] initial +Initialized empty Git repository in /tmp/tmptpCSQ2/remote/.git/ +[master (root-commit) 306959f] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master f18c892] initial +[master 253f098] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master aab68e9] modified +[master 4da5381] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt -test_orphaned_overflow (test.test_git.GitClientOverflowTest) ... Cloning into '/tmp/tmp5ljETC/ros'... +test_orphaned_overflow (test.test_git.GitClientOverflowTest) ... Cloning into '/tmp/tmptpCSQ2/ros'... done. Note: checking out 'test_tag'. @@ -1466,145 +1502,145 @@ git checkout -b -HEAD is now at 1fc476f initial -[detached HEAD 71eb727] modified-0 +HEAD is now at 306959f initial +[detached HEAD aa88b52] modified-0 Author: Your Name 1 file changed, 1 insertion(+) create mode 100644 count.txt ok -Initialized empty Git repository in /tmp/tmpbeVGgD/remote/.git/ -[master (root-commit) 1716a3c] initial +Initialized empty Git repository in /tmp/tmp_rbR7l/remote/.git/ +[master (root-commit) 077abe0] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 213334d] initial +[master 521ace1] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 1de62be] modified +[master 6fee21e] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt -test_update_fetch_all_tags (test.test_git.GitClientRemoteVersionFetchTest) ... Cloning into '/tmp/tmpbeVGgD/ros'... +test_update_fetch_all_tags (test.test_git.GitClientRemoteVersionFetchTest) ... Cloning into '/tmp/tmp_rbR7l/ros'... done. -[master b0046a2] newfile +[master eb46f6e] newfile Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 new_file.txt -From /tmp/tmpbeVGgD/remote - 1de62be..b0046a2 master -> origin/master +From /tmp/tmp_rbR7l/remote + 6fee21e..eb46f6e master -> origin/master ok -Initialized empty Git repository in /tmp/tmpFNjSbH/remote/.git/ -[master (root-commit) 1716a3c] initial +Initialized empty Git repository in /tmp/tmp4icgcH/remote/.git/ +[master (root-commit) a3d5c23] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 2ac1e45] initial +[master 0b0ae66] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 6729be5] modified +[master 6d23237] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt testDiffClean (test.test_git.GitClientTest) ... ok testStatusClean (test.test_git.GitClientTest) ... ok -test_checkout (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_checkout (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. ok -test_checkout_dir_exists (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_checkout_dir_exists (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. -fatal: destination path '/tmp/tmpFNjSbH/ros' already exists and is not an empty directory. +fatal: destination path '/tmp/tmp4icgcH/ros' already exists and is not an empty directory. ok -test_checkout_local_only_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_checkout_local_only_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. -HEAD is now at 2ac1e45 initial +HEAD is now at 0b0ae66 initial Switched to a new branch 'new_local_branch' ok -test_checkout_master_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_checkout_master_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. ok -test_checkout_no_unnecessary_updates (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_checkout_no_unnecessary_updates (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. ok -test_checkout_no_unnecessary_updates_other_branch (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_checkout_no_unnecessary_updates_other_branch (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. ok -test_checkout_shallow (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_checkout_shallow (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... ok -test_checkout_specific_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_checkout_specific_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. ok -test_checkout_specific_tag_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_checkout_specific_tag_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. ok -test_checkout_specific_version_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_checkout_specific_version_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. ok -test_fast_forward (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_fast_forward (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. -HEAD is now at 1716a3c initial +HEAD is now at a3d5c23 initial ok -test_fast_forward_diverged (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_fast_forward_diverged (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. -HEAD is now at 1716a3c initial -[master ce55032] diverge +HEAD is now at a3d5c23 initial +[master 2b30a67] diverge Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt ok -test_fast_forward_simple_ref (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_fast_forward_simple_ref (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. -HEAD is now at 1716a3c initial +HEAD is now at a3d5c23 initial ok -test_get_branch_parent (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_get_branch_parent (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. -From /tmp/tmpFNjSbH/remote +From /tmp/tmp4icgcH/remote * [new branch] master -> remote2/master * [new branch] test_branch -> remote2/test_branch ok -test_get_current_version_label (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_get_current_version_label (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. -From /tmp/tmpFNjSbH/remote +From /tmp/tmp4icgcH/remote * [new branch] test_branch -> remote2/test_branch * [new branch] master -> remote2/master ok test_get_environment_metadata (test.test_git.GitClientTest) ... ok -test_get_remote_version (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_get_remote_version (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. -HEAD is now at 1716a3c initial -From /tmp/tmpFNjSbH/remote +HEAD is now at a3d5c23 initial +From /tmp/tmp4icgcH/remote * [new branch] test_branch -> remote2/test_branch * [new branch] master -> remote2/master ok test_get_type_name (test.test_git.GitClientTest) ... ok -test_get_url_by_reading (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_get_url_by_reading (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. ok test_get_url_nonexistant (test.test_git.GitClientTest) ... ok -test_get_version_not_exist (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpFNjSbH/ros'... +test_get_version_not_exist (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp4icgcH/ros'... done. ok -Initialized empty Git repository in /tmp/tmp3TmdEQ/remote/.git/ -[master (root-commit) 34b6d02] initial +Initialized empty Git repository in /tmp/tmpT4Ngu0/remote/.git/ +[master (root-commit) a57c694] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master d153e23] initial +[master 3622f9b] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 0479564] modified +[master 280ee18] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt -test_update_fetch_all_tags (test.test_git.GitClientUpdateTest) ... Cloning into '/tmp/tmp3TmdEQ/ros'... +test_update_fetch_all_tags (test.test_git.GitClientUpdateTest) ... Cloning into '/tmp/tmpT4Ngu0/ros'... done. Note: checking out 'test_tag'. @@ -1617,47 +1653,47 @@ git checkout -b -HEAD is now at 34b6d02 initial -[detached HEAD 9fa45e1] altfile +HEAD is now at a57c694 initial +[detached HEAD c576638] altfile Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 alt_file.txt Warning: you are leaving 1 commit behind, not connected to any of your branches: - 9fa45e1 altfile + c576638 altfile If you want to keep it by creating a new branch, this may be a good time to do so with: - git branch 9fa45e1 + git branch c576638 -HEAD is now at 34b6d02 initial -[detached HEAD cc55b2d] newfile +HEAD is now at a57c694 initial +[detached HEAD 3960e32] newfile Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 new_file.txt -From /tmp/tmp3TmdEQ/remote +From /tmp/tmpT4Ngu0/remote * [new branch] alt_branch -> origin/alt_branch -From /tmp/tmp3TmdEQ/remote +From /tmp/tmpT4Ngu0/remote * [new tag] new_tag -> new_tag ok -Initialized empty Git repository in /tmp/tmpLtTkEf/remote/.git/ -[master (root-commit) 578f021] initial +Initialized empty Git repository in /tmp/tmpTmaI6C/remote/.git/ +[master (root-commit) 2f283f1] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master da9c5e2] initial +[master e9ef3ce] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master ee66e10] modified +[master ac04bc9] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt -Cloning into '/tmp/tmpLtTkEf/ros'... +Cloning into '/tmp/tmpTmaI6C/ros'... done. rm 'deleted.txt' testDiff (test.test_git.GitDiffStatClientTest) ... ok @@ -1665,149 +1701,149 @@ testStatus (test.test_git.GitDiffStatClientTest) ... ok testStatusRelPath (test.test_git.GitDiffStatClientTest) ... ok testStatusUntracked (test.test_git.GitDiffStatClientTest) ... ok -Initialized empty Git repository in /tmp/tmp8QGHzm/remote/.git/ -[master (root-commit) 578f021] initial +Initialized empty Git repository in /tmp/tmpvOcKNw/remote/.git/ +[master (root-commit) 808d164] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master da9c5e2] initial +[master 3b7329b] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master ee66e10] modified +[master 77a2e3a] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt -Cloning into '/tmp/tmp8QGHzm/ros'... +Cloning into '/tmp/tmpvOcKNw/ros'... done. -testExportRepository (test.test_git.GitExportClientTest) ... Cloning into '/tmp/tmpChQ8ys'... +testExportRepository (test.test_git.GitExportClientTest) ... Cloning into '/tmp/tmpjQfg5n'... warning: --depth is ignored in local clones; use file:// instead. done. ok -Initialized empty Git repository in /tmp/tmpfMjy0V/remote/.git/ -[master (root-commit) 6530539] initial +Initialized empty Git repository in /tmp/tmpsEyGj4/remote/.git/ +[master (root-commit) 31badd8] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 7d247f3] initial +[master afb4192] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 267ec77] modified +[master 0f29692] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt -testGetBranches (test.test_git.GitGetBranchesClientTest) ... Cloning into '/tmp/tmpfMjy0V/ros'... +testGetBranches (test.test_git.GitGetBranchesClientTest) ... Cloning into '/tmp/tmpsEyGj4/ros'... done. ok -Initialized empty Git repository in /tmp/tmpGRliuH/remote/.git/ -[master (root-commit) 6530539] initial +Initialized empty Git repository in /tmp/tmpDDRVIv/remote/.git/ +[master (root-commit) 31badd8] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 7d247f3] initial +[master afb4192] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 267ec77] modified +[master 0f29692] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt -test_get_default_remote_version_label (test.test_git.GitSwitchDefaultBranchTest) ... Cloning into '/tmp/tmpGRliuH/ros'... +test_get_default_remote_version_label (test.test_git.GitSwitchDefaultBranchTest) ... Cloning into '/tmp/tmpDDRVIv/ros'... done. ok -test_checkout_timeout (test.test_git.GitTimeoutTest) ... Cloning into '/tmp/tmpYPIZxq/ros'... +test_checkout_timeout (test.test_git.GitTimeoutTest) ... Cloning into '/tmp/tmpjGrauh/ros'... error: cannot run ssh: No such file or directory fatal: unable to fork ok -Initialized empty Git repository in /tmp/tmp3SGeWk/remote/.git/ -[master (root-commit) cad4b79] initial +Initialized empty Git repository in /tmp/tmp0gpgZq/remote/.git/ +[master (root-commit) ce9a8df] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -Initialized empty Git repository in /tmp/tmp3SGeWk/submodule/.git/ -[master (root-commit) 25d28c9] initial +Initialized empty Git repository in /tmp/tmp0gpgZq/submodule/.git/ +[master (root-commit) fc836a9] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 subfixed.txt -Initialized empty Git repository in /tmp/tmp3SGeWk/subsubmodule/.git/ -[master (root-commit) ad81ea9] initial +Initialized empty Git repository in /tmp/tmp0gpgZq/subsubmodule/.git/ +[master (root-commit) b6ae225] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 subsubfixed.txt -Cloning into '/tmp/tmp3SGeWk/submodule/subsubmodule'... +Cloning into '/tmp/tmp0gpgZq/submodule/subsubmodule'... done. -[master aa0c538] subsubmodule +[master 1ceab37] subsubmodule Author: Your Name 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 subsubmodule Switched to a new branch 'test_branch' -Cloning into '/tmp/tmp3SGeWk/remote/submodule2'... +Cloning into '/tmp/tmp0gpgZq/remote/submodule2'... done. -[test_branch dfbc75a] submodule +[test_branch 1554642] submodule Author: Your Name 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 submodule2 warning: unable to rmdir 'submodule2': Directory not empty Switched to branch 'master' -Cloning into '/tmp/tmp3SGeWk/remote/submodule'... +Cloning into '/tmp/tmp0gpgZq/remote/submodule'... done. -[master 9340e4d] submodule +[master b30139e] submodule Author: Your Name 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 submodule -test_checkout_branch_without_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp3SGeWk/local'... +test_checkout_branch_without_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp0gpgZq/local'... done. ok -test_checkout_master_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp3SGeWk/local'... +test_checkout_master_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp0gpgZq/local'... done. -Submodule 'submodule' (/tmp/tmp3SGeWk/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp3SGeWk/local/submodule'... +Submodule 'submodule' (/tmp/tmp0gpgZq/submodule) registered for path 'submodule' +Cloning into '/tmp/tmp0gpgZq/local/submodule'... done. -Submodule path 'submodule': checked out 'aa0c538299ae306c67c033c6df21beb7a6d6eb35' -Submodule 'subsubmodule' (/tmp/tmp3SGeWk/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp3SGeWk/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out '1ceab37e881a109c604c62f73ded1dba9e1cad06' +Submodule 'subsubmodule' (/tmp/tmp0gpgZq/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmp0gpgZq/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'ad81ea909efe95de6c640a8751713f6eae1ff416' +Submodule path 'submodule/subsubmodule': checked out 'b6ae22593e468a64dadb0cdf966a4247d02ce086' ok -test_checkout_master_with_subs2 (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp3SGeWk/local'... +test_checkout_master_with_subs2 (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp0gpgZq/local'... done. ok -test_checkout_test_branch_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp3SGeWk/local'... +test_checkout_test_branch_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp0gpgZq/local'... done. ok -test_diff (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp3SGeWk/local'... +test_diff (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp0gpgZq/local'... done. -Submodule 'submodule' (/tmp/tmp3SGeWk/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp3SGeWk/local/submodule'... +Submodule 'submodule' (/tmp/tmp0gpgZq/submodule) registered for path 'submodule' +Cloning into '/tmp/tmp0gpgZq/local/submodule'... done. -Submodule path 'submodule': checked out 'aa0c538299ae306c67c033c6df21beb7a6d6eb35' -Submodule 'subsubmodule' (/tmp/tmp3SGeWk/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp3SGeWk/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out '1ceab37e881a109c604c62f73ded1dba9e1cad06' +Submodule 'subsubmodule' (/tmp/tmp0gpgZq/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmp0gpgZq/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'ad81ea909efe95de6c640a8751713f6eae1ff416' +Submodule path 'submodule/subsubmodule': checked out 'b6ae22593e468a64dadb0cdf966a4247d02ce086' ok -test_export_branch (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp3SGeWk/local'... +test_export_branch (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp0gpgZq/local'... done. -Cloning into '/tmp/tmpIxq9Fw'... +Cloning into '/tmp/tmpcXMEvg'... warning: --depth is ignored in local clones; use file:// instead. done. ok -test_export_hash (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp3SGeWk/local'... +test_export_hash (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp0gpgZq/local'... done. -Cloning into '/tmp/tmpui3V3O'... +Cloning into '/tmp/tmpV1yjpC'... warning: --depth is ignored in local clones; use file:// instead. done. -Note: checking out 'dfbc75a632ea5f02604eb6dff8def14b4fed83fa'. +Note: checking out '1554642ae3df295cbe0067a19358f0ed13068c56'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this @@ -1819,57 +1855,57 @@ git checkout -b ok -test_export_master (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp3SGeWk/local'... +test_export_master (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp0gpgZq/local'... done. -Submodule 'submodule' (/tmp/tmp3SGeWk/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp3SGeWk/local/submodule'... +Submodule 'submodule' (/tmp/tmp0gpgZq/submodule) registered for path 'submodule' +Cloning into '/tmp/tmp0gpgZq/local/submodule'... done. -Submodule path 'submodule': checked out 'aa0c538299ae306c67c033c6df21beb7a6d6eb35' -Submodule 'subsubmodule' (/tmp/tmp3SGeWk/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp3SGeWk/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out '1ceab37e881a109c604c62f73ded1dba9e1cad06' +Submodule 'subsubmodule' (/tmp/tmp0gpgZq/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmp0gpgZq/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'ad81ea909efe95de6c640a8751713f6eae1ff416' -Cloning into '/tmp/tmp6Xu9sf'... +Submodule path 'submodule/subsubmodule': checked out 'b6ae22593e468a64dadb0cdf966a4247d02ce086' +Cloning into '/tmp/tmpfH3Llj'... warning: --depth is ignored in local clones; use file:// instead. done. ok -test_status (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp3SGeWk/local'... +test_status (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp0gpgZq/local'... done. -Submodule 'submodule' (/tmp/tmp3SGeWk/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp3SGeWk/local/submodule'... +Submodule 'submodule' (/tmp/tmp0gpgZq/submodule) registered for path 'submodule' +Cloning into '/tmp/tmp0gpgZq/local/submodule'... done. -Submodule path 'submodule': checked out 'aa0c538299ae306c67c033c6df21beb7a6d6eb35' -Submodule 'subsubmodule' (/tmp/tmp3SGeWk/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp3SGeWk/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out '1ceab37e881a109c604c62f73ded1dba9e1cad06' +Submodule 'subsubmodule' (/tmp/tmp0gpgZq/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmp0gpgZq/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'ad81ea909efe95de6c640a8751713f6eae1ff416' +Submodule path 'submodule/subsubmodule': checked out 'b6ae22593e468a64dadb0cdf966a4247d02ce086' ok -test_switch_branches (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp3SGeWk/local'... +test_switch_branches (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp0gpgZq/local'... done. -Submodule 'submodule' (/tmp/tmp3SGeWk/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp3SGeWk/local/submodule'... +Submodule 'submodule' (/tmp/tmp0gpgZq/submodule) registered for path 'submodule' +Cloning into '/tmp/tmp0gpgZq/local/submodule'... done. -Submodule path 'submodule': checked out 'aa0c538299ae306c67c033c6df21beb7a6d6eb35' -Submodule 'subsubmodule' (/tmp/tmp3SGeWk/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp3SGeWk/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out '1ceab37e881a109c604c62f73ded1dba9e1cad06' +Submodule 'subsubmodule' (/tmp/tmp0gpgZq/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmp0gpgZq/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'ad81ea909efe95de6c640a8751713f6eae1ff416' +Submodule path 'submodule/subsubmodule': checked out 'b6ae22593e468a64dadb0cdf966a4247d02ce086' ok -test_switch_branches_retrieve_local_subcommit (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp3SGeWk/local'... +test_switch_branches_retrieve_local_subcommit (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp0gpgZq/local'... done. -Submodule 'submodule' (/tmp/tmp3SGeWk/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp3SGeWk/local/submodule'... +Submodule 'submodule' (/tmp/tmp0gpgZq/submodule) registered for path 'submodule' +Cloning into '/tmp/tmp0gpgZq/local/submodule'... done. -Submodule path 'submodule': checked out 'aa0c538299ae306c67c033c6df21beb7a6d6eb35' -Submodule 'subsubmodule' (/tmp/tmp3SGeWk/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp3SGeWk/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out '1ceab37e881a109c604c62f73ded1dba9e1cad06' +Submodule 'subsubmodule' (/tmp/tmp0gpgZq/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmp0gpgZq/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'ad81ea909efe95de6c640a8751713f6eae1ff416' -[detached HEAD 58392a8] submodif +Submodule path 'submodule/subsubmodule': checked out 'b6ae22593e468a64dadb0cdf966a4247d02ce086' +[detached HEAD 22559b9] submodif Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 submodif.txt -[test_branch bcb8538] submodule2_modif +[test_branch 96199e0] submodule2_modif Author: Your Name 1 file changed, 1 insertion(+), 1 deletion(-) ok @@ -1877,13 +1913,13 @@ (branches are permanent and global, did you want a bookmark?) updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -test_get_log_defaults (test.test_hg.HGAffectedFilesTest) ... abort: destination '/tmp/tmpScyKSz/local' is not empty +test_get_log_defaults (test.test_hg.HGAffectedFilesTest) ... abort: destination '/tmp/tmpFXGlY0/local' is not empty ok marked working directory as branch test_branch (branches are permanent and global, did you want a bookmark?) updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -test_get_log_defaults (test.test_hg.HGClientLogTest) ... abort: destination '/tmp/tmpqddTER/local' is not empty +test_get_log_defaults (test.test_hg.HGClientLogTest) ... abort: destination '/tmp/tmpL9jyC3/local' is not empty ok test_get_log_limit (test.test_hg.HGClientLogTest) ... updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -1900,7 +1936,7 @@ ok test_checkout_dir_exists (test.test_hg.HGClientTest) ... updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -abort: destination '/tmp/tmpXDbkgh/local' is not empty +abort: destination '/tmp/tmpJt8NxH/local' is not empty ok test_checkout_emptystringversion (test.test_hg.HGClientTest) ... updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -1911,19 +1947,19 @@ test_checkout_specific_version_and_update (test.test_hg.HGClientTest) ... updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpXDbkgh/remote +pulling from /tmp/tmpJt8NxH/remote searching for changes no changes found 0 files updated, 0 files merged, 2 files removed, 0 files unresolved -pulling from /tmp/tmpXDbkgh/remote +pulling from /tmp/tmpJt8NxH/remote searching for changes no changes found 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpXDbkgh/remote +pulling from /tmp/tmpJt8NxH/remote searching for changes no changes found 0 files updated, 0 files merged, 2 files removed, 0 files unresolved -pulling from /tmp/tmpXDbkgh/remote +pulling from /tmp/tmpJt8NxH/remote searching for changes no changes found 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -1931,11 +1967,11 @@ test_get_current_version_label (test.test_hg.HGClientTest) ... updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 5 files removed, 0 files unresolved -pulling from /tmp/tmpXDbkgh/remote +pulling from /tmp/tmpJt8NxH/remote searching for changes no changes found 5 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpXDbkgh/remote +pulling from /tmp/tmpJt8NxH/remote searching for changes no changes found 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -1943,12 +1979,12 @@ test_get_environment_metadata (test.test_hg.HGClientTest) ... ok test_get_remote_version (test.test_hg.HGClientTest) ... updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -abort: destination '/tmp/tmpXDbkgh/local' is not empty -pulling from /tmp/tmpXDbkgh/remote +abort: destination '/tmp/tmpJt8NxH/local' is not empty +pulling from /tmp/tmpJt8NxH/remote searching for changes no changes found 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpXDbkgh/remote +pulling from /tmp/tmpJt8NxH/remote searching for changes no changes found 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -1979,17 +2015,17 @@ (branches are permanent and global, did you want a bookmark?) updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -test_get_branches (test.test_hg.HGGetBranchesClientTest) ... pulling from /tmp/tmpa__gZr/remote +test_get_branches (test.test_hg.HGGetBranchesClientTest) ... pulling from /tmp/tmphQGDQI/remote searching for changes no changes found fixed.txt already tracked! -pulling from /tmp/tmpa__gZr/remote +pulling from /tmp/tmphQGDQI/remote searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files -new changesets 08e37761000d +new changesets 83b9d7bc4d61 (run 'hg update' to get a working copy) ok marked working directory as branch test_branch @@ -2032,13 +2068,13 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpDJ_ilL/local/deleted-fs.txt -A /tmp/tmpDJ_ilL/local/deleted.txt -A /tmp/tmpDJ_ilL/local/fixed.txt -A /tmp/tmpDJ_ilL/local/modified-fs.txt -A /tmp/tmpDJ_ilL/local/modified.txt +A /tmp/tmpWiOmZN/local/deleted-fs.txt +A /tmp/tmpWiOmZN/local/deleted.txt +A /tmp/tmpWiOmZN/local/fixed.txt +A /tmp/tmpWiOmZN/local/modified-fs.txt +A /tmp/tmpWiOmZN/local/modified.txt Checked out revision 4. -test_get_affected_files (test.test_svn.SVNClientAffectedFiles) ... ERROR [vcstools] Can't remove /tmp/tmpDJ_ilL/local[/vcstools] +test_get_affected_files (test.test_svn.SVNClientAffectedFiles) ... ERROR [vcstools] Can't remove /tmp/tmpWiOmZN/local[/vcstools] ok Checked out revision 0. A trunk @@ -2073,26 +2109,26 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpN_cjJi/local/deleted-fs.txt -A /tmp/tmpN_cjJi/local/deleted.txt -A /tmp/tmpN_cjJi/local/fixed.txt -A /tmp/tmpN_cjJi/local/modified-fs.txt -A /tmp/tmpN_cjJi/local/modified.txt -Checked out revision 4. -test_get_log_defaults (test.test_svn.SvnClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmpN_cjJi/local[/vcstools] -ok -test_get_log_limit (test.test_svn.SvnClientLogTest) ... A /tmp/tmpN_cjJi/local/deleted-fs.txt -A /tmp/tmpN_cjJi/local/deleted.txt -A /tmp/tmpN_cjJi/local/fixed.txt -A /tmp/tmpN_cjJi/local/modified-fs.txt -A /tmp/tmpN_cjJi/local/modified.txt -Checked out revision 4. -ok -test_get_log_path (test.test_svn.SvnClientLogTest) ... A /tmp/tmpN_cjJi/local/deleted-fs.txt -A /tmp/tmpN_cjJi/local/deleted.txt -A /tmp/tmpN_cjJi/local/fixed.txt -A /tmp/tmpN_cjJi/local/modified-fs.txt -A /tmp/tmpN_cjJi/local/modified.txt +A /tmp/tmpRCjtPT/local/deleted-fs.txt +A /tmp/tmpRCjtPT/local/deleted.txt +A /tmp/tmpRCjtPT/local/fixed.txt +A /tmp/tmpRCjtPT/local/modified-fs.txt +A /tmp/tmpRCjtPT/local/modified.txt +Checked out revision 4. +test_get_log_defaults (test.test_svn.SvnClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmpRCjtPT/local[/vcstools] +ok +test_get_log_limit (test.test_svn.SvnClientLogTest) ... A /tmp/tmpRCjtPT/local/deleted-fs.txt +A /tmp/tmpRCjtPT/local/deleted.txt +A /tmp/tmpRCjtPT/local/fixed.txt +A /tmp/tmpRCjtPT/local/modified-fs.txt +A /tmp/tmpRCjtPT/local/modified.txt +Checked out revision 4. +ok +test_get_log_path (test.test_svn.SvnClientLogTest) ... A /tmp/tmpRCjtPT/local/deleted-fs.txt +A /tmp/tmpRCjtPT/local/deleted.txt +A /tmp/tmpRCjtPT/local/fixed.txt +A /tmp/tmpRCjtPT/local/modified-fs.txt +A /tmp/tmpRCjtPT/local/modified.txt Checked out revision 4. ok Checked out revision 0. @@ -2129,66 +2165,66 @@ Committing transaction... Committed revision 4. testDiffClean (test.test_svn.SvnClientTest) ... WARNING [vcstools] Command failed: 'svn diff "."' - run at: '/tmp/tmp68bP1Q/remote' + run at: '/tmp/tmplK9zCl/remote' errcode: 1: -svn: E155007: '/tmp/tmp68bP1Q/remote' is not a working copy +svn: E155007: '/tmp/tmplK9zCl/remote' is not a working copy [/vcstools] ok testStatusClean (test.test_svn.SvnClientTest) ... ok -test_checkout (test.test_svn.SvnClientTest) ... A /tmp/tmp68bP1Q/local/deleted-fs.txt -A /tmp/tmp68bP1Q/local/deleted.txt -A /tmp/tmp68bP1Q/local/fixed.txt -A /tmp/tmp68bP1Q/local/modified-fs.txt -A /tmp/tmp68bP1Q/local/modified.txt -Checked out revision 4. -ok -test_checkout_dir_exists (test.test_svn.SvnClientTest) ... A /tmp/tmp68bP1Q/local/deleted-fs.txt -A /tmp/tmp68bP1Q/local/deleted.txt -A /tmp/tmp68bP1Q/local/fixed.txt -A /tmp/tmp68bP1Q/local/modified-fs.txt -A /tmp/tmp68bP1Q/local/modified.txt -Checked out revision 4. -ERROR [vcstools] Can't remove /tmp/tmp68bP1Q/local[/vcstools] -ok -test_checkout_emptyversion (test.test_svn.SvnClientTest) ... A /tmp/tmp68bP1Q/local/deleted-fs.txt -A /tmp/tmp68bP1Q/local/deleted.txt -A /tmp/tmp68bP1Q/local/fixed.txt -A /tmp/tmp68bP1Q/local/modified-fs.txt -A /tmp/tmp68bP1Q/local/modified.txt +test_checkout (test.test_svn.SvnClientTest) ... A /tmp/tmplK9zCl/local/deleted-fs.txt +A /tmp/tmplK9zCl/local/deleted.txt +A /tmp/tmplK9zCl/local/fixed.txt +A /tmp/tmplK9zCl/local/modified-fs.txt +A /tmp/tmplK9zCl/local/modified.txt +Checked out revision 4. +ok +test_checkout_dir_exists (test.test_svn.SvnClientTest) ... A /tmp/tmplK9zCl/local/deleted-fs.txt +A /tmp/tmplK9zCl/local/deleted.txt +A /tmp/tmplK9zCl/local/fixed.txt +A /tmp/tmplK9zCl/local/modified-fs.txt +A /tmp/tmplK9zCl/local/modified.txt +Checked out revision 4. +ERROR [vcstools] Can't remove /tmp/tmplK9zCl/local[/vcstools] +ok +test_checkout_emptyversion (test.test_svn.SvnClientTest) ... A /tmp/tmplK9zCl/local/deleted-fs.txt +A /tmp/tmplK9zCl/local/deleted.txt +A /tmp/tmplK9zCl/local/fixed.txt +A /tmp/tmplK9zCl/local/modified-fs.txt +A /tmp/tmplK9zCl/local/modified.txt Checked out revision 4. -Updating '/tmp/tmp68bP1Q/local': +Updating '/tmp/tmplK9zCl/local': At revision 4. -Updating '/tmp/tmp68bP1Q/local': +Updating '/tmp/tmplK9zCl/local': At revision 4. ok -using just a number as version ... A /tmp/tmp68bP1Q/local/deleted-fs.txt -A /tmp/tmp68bP1Q/local/deleted.txt -A /tmp/tmp68bP1Q/local/fixed.txt -A /tmp/tmp68bP1Q/local/modified-fs.txt -A /tmp/tmp68bP1Q/local/modified.txt +using just a number as version ... A /tmp/tmplK9zCl/local/deleted-fs.txt +A /tmp/tmplK9zCl/local/deleted.txt +A /tmp/tmplK9zCl/local/fixed.txt +A /tmp/tmplK9zCl/local/modified-fs.txt +A /tmp/tmplK9zCl/local/modified.txt Checked out revision 3. -Updating '/tmp/tmp68bP1Q/local': -D /tmp/tmp68bP1Q/local/deleted.txt -D /tmp/tmp68bP1Q/local/deleted-fs.txt +Updating '/tmp/tmplK9zCl/local': +D /tmp/tmplK9zCl/local/deleted.txt +D /tmp/tmplK9zCl/local/deleted-fs.txt Updated to revision 2. ok test_get_environment_metadata (test.test_svn.SvnClientTest) ... ok -test_get_remote_branch_version (test.test_svn.SvnClientTest) ... A /tmp/tmp68bP1Q/local/modified.txt +test_get_remote_branch_version (test.test_svn.SvnClientTest) ... A /tmp/tmplK9zCl/local/modified.txt Checked out revision 4. ok -test_get_remote_version (test.test_svn.SvnClientTest) ... A /tmp/tmp68bP1Q/local/deleted-fs.txt -A /tmp/tmp68bP1Q/local/deleted.txt -A /tmp/tmp68bP1Q/local/fixed.txt -A /tmp/tmp68bP1Q/local/modified-fs.txt -A /tmp/tmp68bP1Q/local/modified.txt +test_get_remote_version (test.test_svn.SvnClientTest) ... A /tmp/tmplK9zCl/local/deleted-fs.txt +A /tmp/tmplK9zCl/local/deleted.txt +A /tmp/tmplK9zCl/local/fixed.txt +A /tmp/tmplK9zCl/local/modified-fs.txt +A /tmp/tmplK9zCl/local/modified.txt Checked out revision 4. ok test_get_type_name (test.test_svn.SvnClientTest) ... ok -test_get_url_by_reading (test.test_svn.SvnClientTest) ... A /tmp/tmp68bP1Q/local/deleted-fs.txt -A /tmp/tmp68bP1Q/local/deleted.txt -A /tmp/tmp68bP1Q/local/fixed.txt -A /tmp/tmp68bP1Q/local/modified-fs.txt -A /tmp/tmp68bP1Q/local/modified.txt +test_get_url_by_reading (test.test_svn.SvnClientTest) ... A /tmp/tmplK9zCl/local/deleted-fs.txt +A /tmp/tmplK9zCl/local/deleted.txt +A /tmp/tmplK9zCl/local/fixed.txt +A /tmp/tmplK9zCl/local/modified-fs.txt +A /tmp/tmplK9zCl/local/modified.txt Checked out revision 4. ok test_get_url_nonexistant (test.test_svn.SvnClientTest) ... ok @@ -2226,11 +2262,11 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpi1oMNJ/local/deleted-fs.txt -A /tmp/tmpi1oMNJ/local/deleted.txt -A /tmp/tmpi1oMNJ/local/fixed.txt -A /tmp/tmpi1oMNJ/local/modified-fs.txt -A /tmp/tmpi1oMNJ/local/modified.txt +A /tmp/tmpxxD6Gc/local/deleted-fs.txt +A /tmp/tmpxxD6Gc/local/deleted.txt +A /tmp/tmpxxD6Gc/local/fixed.txt +A /tmp/tmpxxD6Gc/local/modified-fs.txt +A /tmp/tmpxxD6Gc/local/modified.txt Checked out revision 4. D deleted.txt A added.txt @@ -2272,11 +2308,11 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmppSyyXs/local/deleted-fs.txt -A /tmp/tmppSyyXs/local/deleted.txt -A /tmp/tmppSyyXs/local/fixed.txt -A /tmp/tmppSyyXs/local/modified-fs.txt -A /tmp/tmppSyyXs/local/modified.txt +A /tmp/tmpMslrHZ/local/deleted-fs.txt +A /tmp/tmpMslrHZ/local/deleted.txt +A /tmp/tmpMslrHZ/local/fixed.txt +A /tmp/tmpMslrHZ/local/modified-fs.txt +A /tmp/tmpMslrHZ/local/modified.txt Checked out revision 4. test_export_repository (test.test_svn.SvnExportRepositoryClientTest) ... ok Checked out revision 0. @@ -2312,11 +2348,11 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpeikagq/local/deleted-fs.txt -A /tmp/tmpeikagq/local/deleted.txt -A /tmp/tmpeikagq/local/fixed.txt -A /tmp/tmpeikagq/local/modified-fs.txt -A /tmp/tmpeikagq/local/modified.txt +A /tmp/tmpHHVsA9/local/deleted-fs.txt +A /tmp/tmpHHVsA9/local/deleted.txt +A /tmp/tmpHHVsA9/local/fixed.txt +A /tmp/tmpHHVsA9/local/modified-fs.txt +A /tmp/tmpHHVsA9/local/modified.txt Checked out revision 4. test_get_branches (test.test_svn.SvnGetBranchesClientTest) ... A branches/foo2 A branches/bar @@ -2324,7 +2360,7 @@ Adding branches/foo2 Committing transaction... Committed revision 5. -A /tmp/tmpeikagq/local_foo/modified.txt +A /tmp/tmpHHVsA9/local_foo/modified.txt Checked out revision 5. ok test_get_branches_non_canonical (test.test_svn.SvnGetBranchesClientTest) ... Checked out revision 0. @@ -2337,8 +2373,8 @@ Transmitting file data .done Committing transaction... Committed revision 1. -A /tmp/tmpeikagq/local_nc/foosub -A /tmp/tmpeikagq/local_nc/foosub/fixed.txt +A /tmp/tmpHHVsA9/local_nc/foosub +A /tmp/tmpHHVsA9/local_nc/foosub/fixed.txt Checked out revision 1. ok test_get_remote_contents (test.test_svn.SvnGetBranchesClientTest) ... ok @@ -2356,7 +2392,7 @@ test_register_vcs (test.test_vcs_abstraction.TestVcsAbstraction) ... ok ---------------------------------------------------------------------- -Ran 147 tests in 124.186s +Ran 147 tests in 280.239s OK I: pybuild base:217: cd /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build; python3.7 -m nose -v test @@ -2365,11 +2401,11 @@ test_sanitized (test.test_base.BaseTest) ... ok test_shell_command (test.test_base.BaseTest) ... WARNING [vcstools] Command failed: '[' errcode: 2: -/bin/sh: 1: [: missing ] +/bin/sh: line 0: [: missing `]' [/vcstools] WARNING [vcstools] Command failed: 'echo foo && [' errcode: 2: -/bin/sh: 1: [: missing ] +/bin/sh: line 0: [: missing `]' [/vcstools] ERROR [vcstools] Command failed with OSError. 'two words' : [Errno 2] No such file or directory: 'two words': 'two words'[/vcstools] @@ -2378,61 +2414,61 @@ test_urlopen_netrc (test.test_base.BaseTest) ... ok test_urlretrieve_netrc (test.test_base.BaseTest) ... Created a standalone tree (format: 2a) adding fixed.txt -Committing to: /tmp/tmpz44sh4yv/remote/ +Committing to: /tmp/tmpdhn_6_08/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmpz44sh4yv/remote/ +Committing to: /tmp/tmpdhn_6_08/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpz44sh4yv/remote/ +Committing to: /tmp/tmpdhn_6_08/remote/ added deleted-fs.txt added deleted.txt Committed revision 3. ok -test_get_log_defaults (test.test_bzr.BzrClientAffectedFilesTest) ... ERROR [vcstools] Can't remove /tmp/tmpz44sh4yv/local[/vcstools] +test_get_log_defaults (test.test_bzr.BzrClientAffectedFilesTest) ... ERROR [vcstools] Can't remove /tmp/tmpdhn_6_08/local[/vcstools] Created a standalone tree (format: 2a) adding fixed.txt -Committing to: /tmp/tmplonsec8z/remote/ +Committing to: /tmp/tmp2wi_eck_/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmplonsec8z/remote/ +Committing to: /tmp/tmp2wi_eck_/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmplonsec8z/remote/ +Committing to: /tmp/tmp2wi_eck_/remote/ added deleted-fs.txt added deleted.txt Committed revision 3. ok -test_get_log_defaults (test.test_bzr.BzrClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmplonsec8z/local[/vcstools] +test_get_log_defaults (test.test_bzr.BzrClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmp2wi_eck_/local[/vcstools] ok test_get_log_limit (test.test_bzr.BzrClientLogTest) ... ok test_get_log_path (test.test_bzr.BzrClientLogTest) ... Created a standalone tree (format: 2a) adding fixed.txt -Committing to: /tmp/tmpckx0gezo/remote/ +Committing to: /tmp/tmp76bqarmr/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmpckx0gezo/remote/ +Committing to: /tmp/tmp76bqarmr/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpckx0gezo/remote/ +Committing to: /tmp/tmp76bqarmr/remote/ added deleted-fs.txt added deleted.txt Committed revision 3. @@ -2440,21 +2476,21 @@ testDiffClean (test.test_bzr.BzrClientTest) ... ok testStatusClean (test.test_bzr.BzrClientTest) ... ok test_checkout (test.test_bzr.BzrClientTest) ... ok -test_checkout_dir_exists (test.test_bzr.BzrClientTest) ... ERROR [vcstools] Can't remove /tmp/tmpckx0gezo/local[/vcstools] +test_checkout_dir_exists (test.test_bzr.BzrClientTest) ... ERROR [vcstools] Can't remove /tmp/tmp76bqarmr/local[/vcstools] ok -makes sure failed checkout results in False, not Exception ... WARNING [vcstools] Command failed: 'bzr branch /tmp/tmpckx0gezo/remotefoobar /tmp/tmpckx0gezo/local' +makes sure failed checkout results in False, not Exception ... WARNING [vcstools] Command failed: 'bzr branch /tmp/tmp76bqarmr/remotefoobar /tmp/tmp76bqarmr/local' errcode: 3: -bzr: ERROR: Not a branch: "/tmp/tmpckx0gezo/remotefoobar/". +bzr: ERROR: Not a branch: "/tmp/tmp76bqarmr/remotefoobar/". [/vcstools] -ERROR [vcstools] Command failed: 'bzr branch /tmp/tmpckx0gezo/remotefoobar /tmp/tmpckx0gezo/local' +ERROR [vcstools] Command failed: 'bzr branch /tmp/tmp76bqarmr/remotefoobar /tmp/tmp76bqarmr/local' errcode: 3: -bzr: ERROR: Not a branch: "/tmp/tmpckx0gezo/remotefoobar/". +bzr: ERROR: Not a branch: "/tmp/tmp76bqarmr/remotefoobar/". [/vcstools] ok makes sure no exception happens on invalid update ... WARNING [vcstools] Command failed: 'bzr update -r foobar' - run at: '/tmp/tmpckx0gezo/local' + run at: '/tmp/tmp76bqarmr/local' errcode: 3: -bzr: ERROR: Requested revision: 'foobar' does not exist in branch: file:///tmp/tmpckx0gezo/local/ +bzr: ERROR: Requested revision: 'foobar' does not exist in branch: file:///tmp/tmp76bqarmr/local/ [/vcstools] ok test_checkout_specific_version_and_update (test.test_bzr.BzrClientTest) ... ok @@ -2466,72 +2502,72 @@ test_url_matches_with_shortcut_strings (test.test_bzr.BzrClientTest) ... ok test_url_matches_with_shortcut_strings_slashes (test.test_bzr.BzrClientTest) ... Created a standalone tree (format: 2a) adding fixed.txt -Committing to: /tmp/tmp9janc9jp/remote/ +Committing to: /tmp/tmpv38d8i8i/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmp9janc9jp/remote/ +Committing to: /tmp/tmpv38d8i8i/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmp9janc9jp/remote/ +Committing to: /tmp/tmpv38d8i8i/remote/ added deleted-fs.txt added deleted.txt Committed revision 3. ok test_export_repository (test.test_bzr.BzrDiffStatClientTest) ... ok -Test source code for PEP8 conformance ... Initialized empty Git repository in /tmp/tmpkf5lsqgi/remote/.git/ -[master (root-commit) e418151] initial +Test source code for PEP8 conformance ... Initialized empty Git repository in /tmp/tmpsf30sbk6/remote/.git/ +[master (root-commit) 23dbc94] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master e528c58] initial +[master 387f17b] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master c096a8f] modified +[master 2538999] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt ok -test_get_affected_files (test.test_git.GitClientAffectedFiles) ... Cloning into '/tmp/tmpkf5lsqgi/ros'... +test_get_affected_files (test.test_git.GitClientAffectedFiles) ... Cloning into '/tmp/tmpsf30sbk6/ros'... done. Switched to a new branch 'localbranch' -[localbranch 7ce1d49] local_file +[localbranch ce971e5] local_file Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_file -Initialized empty Git repository in /tmp/tmpr78v5dqi/remote/.git/ -[master (root-commit) e418151] initial +Initialized empty Git repository in /tmp/tmpfy79gu2q/remote/.git/ +[master (root-commit) cc47eca] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master e528c58] initial +[master 032d756] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master c096a8f] modified +[master 7783678] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt ok -test_checkout_untracked_branch_and_update (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpr78v5dqi/ros'... +test_checkout_untracked_branch_and_update (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpfy79gu2q/ros'... done. Switched to a new branch 'localbranch' -[localbranch fc91843] my_branch +[localbranch c7d3329] my_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local.txt Switched to a new branch 'diverged_branch' -[diverged_branch 38f94d1] diverged_branch +[diverged_branch fce4486] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -2546,48 +2582,48 @@ git checkout -b -HEAD is now at e418151 initial -[detached HEAD bf1bf92] no_branch +HEAD is now at cc47eca initial +[detached HEAD 3153311] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD 0808fc9] dangling +[detached HEAD f0664ef] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD c1e7ebb] dangling_tip +[detached HEAD 4864ef2] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was c1e7ebb). +Deleted branch oldbranch (was 4864ef2). Warning: you are leaving 2 commits behind, not connected to any of your branches: - c1e7ebb dangling_tip - 0808fc9 dangling + 4864ef2 dangling_tip + f0664ef dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch c1e7ebb + git branch 4864ef2 Switched to branch 'master' Your branch is up to date with 'origin/master'. vcstools only handles branches tracking default remote, branch 'master' tracks remote 'None' WARNING [vcstools] vcstools only handles branches tracking default remote, branch 'localbranch' tracks remote 'None'. -Repository path is '/tmp/tmpr78v5dqi/ros'.[/vcstools] +Repository path is '/tmp/tmpfy79gu2q/ros'.[/vcstools] vcstools only handles branches tracking default remote, branch 'master' tracks remote 'None' vcstools refusing to move away from dangling commit, to protect your work. ok -test_detached_to_branch (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpr78v5dqi/ros'... +test_detached_to_branch (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpfy79gu2q/ros'... done. Switched to a new branch 'localbranch' -[localbranch de2db5a] my_branch +[localbranch 20e2606] my_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local.txt Switched to a new branch 'diverged_branch' -[diverged_branch 2dbc2b7] diverged_branch +[diverged_branch 0407a7b] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -2602,43 +2638,43 @@ git checkout -b -HEAD is now at e418151 initial -[detached HEAD 94bd11a] no_branch +HEAD is now at cc47eca initial +[detached HEAD a03cf92] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD e0264f2] dangling +[detached HEAD b9eca37] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 9bdc128] dangling_tip +[detached HEAD f096a2d] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 9bdc128). +Deleted branch oldbranch (was f096a2d). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 9bdc128 dangling_tip - e0264f2 dangling + f096a2d dangling_tip + b9eca37 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 9bdc128 + git branch f096a2d Switched to branch 'master' Your branch is up to date with 'origin/master'. ok -test_inject_protection (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpr78v5dqi/ros'... +test_inject_protection (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpfy79gu2q/ros'... done. Switched to a new branch 'localbranch' -[localbranch ab48ba8] my_branch +[localbranch c16b40b] my_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local.txt Switched to a new branch 'diverged_branch' -[diverged_branch ff5bb78] diverged_branch +[diverged_branch e7eccef] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -2653,43 +2689,43 @@ git checkout -b -HEAD is now at e418151 initial -[detached HEAD a738425] no_branch +HEAD is now at cc47eca initial +[detached HEAD 1c35f4c] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD c87a2b6] dangling +[detached HEAD 0982124] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD d04019e] dangling_tip +[detached HEAD c047ac0] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was d04019e). +Deleted branch oldbranch (was c047ac0). Warning: you are leaving 2 commits behind, not connected to any of your branches: - d04019e dangling_tip - c87a2b6 dangling + c047ac0 dangling_tip + 0982124 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch d04019e + git branch c047ac0 Switched to branch 'master' Your branch is up to date with 'origin/master'. ok -test_is_commit_in_orphaned_subtree (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpr78v5dqi/ros'... +test_is_commit_in_orphaned_subtree (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpfy79gu2q/ros'... done. Switched to a new branch 'localbranch' -[localbranch ab48ba8] my_branch +[localbranch c16b40b] my_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local.txt Switched to a new branch 'diverged_branch' -[diverged_branch ff5bb78] diverged_branch +[diverged_branch e7eccef] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -2704,43 +2740,43 @@ git checkout -b -HEAD is now at e418151 initial -[detached HEAD a738425] no_branch +HEAD is now at cc47eca initial +[detached HEAD 1c35f4c] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD c87a2b6] dangling +[detached HEAD 0982124] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD d04019e] dangling_tip +[detached HEAD c047ac0] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was d04019e). +Deleted branch oldbranch (was c047ac0). Warning: you are leaving 2 commits behind, not connected to any of your branches: - d04019e dangling_tip - c87a2b6 dangling + c047ac0 dangling_tip + 0982124 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch d04019e + git branch c047ac0 Switched to branch 'master' Your branch is up to date with 'origin/master'. ok -test_protect_dangling (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpr78v5dqi/ros'... +test_protect_dangling (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpfy79gu2q/ros'... done. Switched to a new branch 'localbranch' -[localbranch f534b50] my_branch +[localbranch 81f673d] my_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local.txt Switched to a new branch 'diverged_branch' -[diverged_branch 0c8dbdb] diverged_branch +[diverged_branch 3788aa7] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -2755,198 +2791,198 @@ git checkout -b -HEAD is now at e418151 initial -[detached HEAD ee094fa] no_branch +HEAD is now at cc47eca initial +[detached HEAD 69b5806] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD ce578b4] dangling +[detached HEAD 4801942] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 337fa1f] dangling_tip +[detached HEAD ec42c51] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 337fa1f). +Deleted branch oldbranch (was ec42c51). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 337fa1f dangling_tip - ce578b4 dangling + ec42c51 dangling_tip + 4801942 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 337fa1f + git branch ec42c51 Switched to branch 'master' Your branch is up to date with 'origin/master'. -Initialized empty Git repository in /tmp/tmpnd1seyhv/remote/.git/ -[master (root-commit) dd2b03d] initial +Initialized empty Git repository in /tmp/tmpb8l225l9/remote/.git/ +[master (root-commit) 17c7395] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 1e8d1e8] initial +[master fb74245] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master ce90cc2] modified +[master 73502d7] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt vcstools refusing to move away from dangling commit, to protect your work. ok -test_get_log_defaults (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmpnd1seyhv/ros'... +test_get_log_defaults (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmpb8l225l9/ros'... done. Switched to a new branch 'localbranch' -[localbranch 7af6c8e] local_0 +[localbranch 4367ae4] local_0 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_0.txt -[localbranch 09e80d4] local_1 +[localbranch a844e30] local_1 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_1.txt -[localbranch b1e5ab1] local_2 +[localbranch 8d2bbde] local_2 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_2.txt -[localbranch 0c84a23] local_3 +[localbranch fd12086] local_3 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_3.txt -[localbranch e564c6f] local_4 +[localbranch 3857126] local_4 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_4.txt -[localbranch eb958df] local_5 +[localbranch 8c65859] local_5 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_5.txt -[localbranch a859841] local_6 +[localbranch a7e1c49] local_6 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_6.txt -[localbranch 1d0f861] local_7 +[localbranch bd912d8] local_7 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_7.txt -[localbranch a1dab8a] local_8 +[localbranch bd00fb2] local_8 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_8.txt -[localbranch bfa26ac] local_9 +[localbranch 2cd44ed] local_9 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_9.txt ok -test_get_log_limit (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmpnd1seyhv/ros'... +test_get_log_limit (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmpb8l225l9/ros'... done. Switched to a new branch 'localbranch' -[localbranch 7af6c8e] local_0 +[localbranch 4367ae4] local_0 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_0.txt -[localbranch 09e80d4] local_1 +[localbranch 6d32065] local_1 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_1.txt -[localbranch b1e5ab1] local_2 +[localbranch 507f8c9] local_2 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_2.txt -[localbranch 0c84a23] local_3 +[localbranch 87c33fc] local_3 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_3.txt -[localbranch e564c6f] local_4 +[localbranch 67b0129] local_4 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_4.txt -[localbranch eb958df] local_5 +[localbranch 566caff] local_5 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_5.txt -[localbranch a859841] local_6 +[localbranch 36b6a1f] local_6 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_6.txt -[localbranch 1d0f861] local_7 +[localbranch 8bdcf78] local_7 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_7.txt -[localbranch a1dab8a] local_8 +[localbranch 56422af] local_8 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_8.txt -[localbranch bfa26ac] local_9 +[localbranch 7a406ce] local_9 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_9.txt ok -test_get_log_path (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmpnd1seyhv/ros'... +test_get_log_path (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmpb8l225l9/ros'... done. Switched to a new branch 'localbranch' -[localbranch 7af6c8e] local_0 +[localbranch bb53733] local_0 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_0.txt -[localbranch 09e80d4] local_1 +[localbranch d7bc4ff] local_1 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_1.txt -[localbranch b1e5ab1] local_2 +[localbranch 2a7a95d] local_2 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_2.txt -[localbranch 0c84a23] local_3 +[localbranch 7ef41ac] local_3 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_3.txt -[localbranch e564c6f] local_4 +[localbranch ce5cfbd] local_4 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_4.txt -[localbranch eb958df] local_5 +[localbranch bc52a38] local_5 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_5.txt -[localbranch a859841] local_6 +[localbranch 6b98bfd] local_6 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_6.txt -[localbranch 1d0f861] local_7 +[localbranch 1efdd1e] local_7 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_7.txt -[localbranch a1dab8a] local_8 +[localbranch 97e823f] local_8 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_8.txt -[localbranch bfa26ac] local_9 +[localbranch 7e1066a] local_9 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_9.txt -Initialized empty Git repository in /tmp/tmp2gsiekye/remote/.git/ -[master (root-commit) 4bd6d7a] initial +Initialized empty Git repository in /tmp/tmpnykpmzy5/remote/.git/ +[master (root-commit) ef2ee16] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master ebcda43] initial +[master 59efc6b] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 4e45f63] modified +[master 593386c] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt ok -test_orphaned_overflow (test.test_git.GitClientOverflowTest) ... Cloning into '/tmp/tmp2gsiekye/ros'... +test_orphaned_overflow (test.test_git.GitClientOverflowTest) ... Cloning into '/tmp/tmpnykpmzy5/ros'... done. Note: checking out 'test_tag'. @@ -2959,46 +2995,46 @@ git checkout -b -HEAD is now at 4bd6d7a initial -[detached HEAD 5e9f31f] modified-0 +HEAD is now at ef2ee16 initial +[detached HEAD 334e5ac] modified-0 Author: Your Name 1 file changed, 1 insertion(+) create mode 100644 count.txt -Initialized empty Git repository in /tmp/tmpb2jlrh51/remote/.git/ -[master (root-commit) d251ac6] initial +Initialized empty Git repository in /tmp/tmp4f2nt2xn/remote/.git/ +[master (root-commit) 897b934] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master f8710e5] initial +[master 422c33f] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 60cca9e] modified +[master c39c4bb] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt ok -test_update_fetch_all_tags (test.test_git.GitClientRemoteVersionFetchTest) ... Cloning into '/tmp/tmpb2jlrh51/ros'... +test_update_fetch_all_tags (test.test_git.GitClientRemoteVersionFetchTest) ... Cloning into '/tmp/tmp4f2nt2xn/ros'... done. -[master 96889f5] newfile +[master e823418] newfile Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 new_file.txt -From /tmp/tmpb2jlrh51/remote - 60cca9e..96889f5 master -> origin/master -Initialized empty Git repository in /tmp/tmpdhzqkf_i/remote/.git/ -[master (root-commit) d251ac6] initial +From /tmp/tmp4f2nt2xn/remote + c39c4bb..e823418 master -> origin/master +Initialized empty Git repository in /tmp/tmp2ycqv1pb/remote/.git/ +[master (root-commit) bec0b96] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master f8710e5] initial +[master 12ffc49] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 60cca9e] modified +[master d2a8309] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt @@ -3006,98 +3042,98 @@ ok testDiffClean (test.test_git.GitClientTest) ... ok testStatusClean (test.test_git.GitClientTest) ... ok -test_checkout (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_checkout (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. ok -test_checkout_dir_exists (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_checkout_dir_exists (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. -fatal: destination path '/tmp/tmpdhzqkf_i/ros' already exists and is not an empty directory. +fatal: destination path '/tmp/tmp2ycqv1pb/ros' already exists and is not an empty directory. ok -test_checkout_local_only_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_checkout_local_only_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. -HEAD is now at f8710e5 initial +HEAD is now at 12ffc49 initial Switched to a new branch 'new_local_branch' ok -test_checkout_master_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_checkout_master_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. ok -test_checkout_no_unnecessary_updates (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_checkout_no_unnecessary_updates (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. ok -test_checkout_no_unnecessary_updates_other_branch (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_checkout_no_unnecessary_updates_other_branch (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. ok -test_checkout_shallow (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_checkout_shallow (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... ok -test_checkout_specific_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_checkout_specific_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. ok -test_checkout_specific_tag_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_checkout_specific_tag_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. ok -test_checkout_specific_version_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_checkout_specific_version_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. ok -test_fast_forward (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_fast_forward (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. -HEAD is now at d251ac6 initial +HEAD is now at bec0b96 initial ok -test_fast_forward_diverged (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_fast_forward_diverged (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. -HEAD is now at d251ac6 initial -[master 35544a0] diverge +HEAD is now at bec0b96 initial +[master bb80cd1] diverge Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt ok -test_fast_forward_simple_ref (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_fast_forward_simple_ref (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. -HEAD is now at d251ac6 initial +HEAD is now at bec0b96 initial ok -test_get_branch_parent (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_get_branch_parent (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. -From /tmp/tmpdhzqkf_i/remote +From /tmp/tmp2ycqv1pb/remote * [new branch] master -> remote2/master * [new branch] test_branch -> remote2/test_branch ok -test_get_current_version_label (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_get_current_version_label (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. -From /tmp/tmpdhzqkf_i/remote +From /tmp/tmp2ycqv1pb/remote * [new branch] test_branch -> remote2/test_branch * [new branch] master -> remote2/master ok test_get_environment_metadata (test.test_git.GitClientTest) ... ok -test_get_remote_version (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_get_remote_version (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. -HEAD is now at d251ac6 initial -From /tmp/tmpdhzqkf_i/remote +HEAD is now at bec0b96 initial +From /tmp/tmp2ycqv1pb/remote * [new branch] test_branch -> remote2/test_branch * [new branch] master -> remote2/master ok test_get_type_name (test.test_git.GitClientTest) ... ok -test_get_url_by_reading (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_get_url_by_reading (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. ok test_get_url_nonexistant (test.test_git.GitClientTest) ... ok -test_get_version_not_exist (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdhzqkf_i/ros'... +test_get_version_not_exist (test.test_git.GitClientTest) ... Cloning into '/tmp/tmp2ycqv1pb/ros'... done. -Initialized empty Git repository in /tmp/tmpbghn3szy/remote/.git/ -[master (root-commit) 457fdc0] initial +Initialized empty Git repository in /tmp/tmpuj7w1in6/remote/.git/ +[master (root-commit) 1b7461d] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master a800f94] initial +[master 1369c35] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master e5df454] modified +[master ff4556b] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt ok -test_update_fetch_all_tags (test.test_git.GitClientUpdateTest) ... Cloning into '/tmp/tmpbghn3szy/ros'... +test_update_fetch_all_tags (test.test_git.GitClientUpdateTest) ... Cloning into '/tmp/tmpuj7w1in6/ros'... done. Note: checking out 'test_tag'. @@ -3110,46 +3146,46 @@ git checkout -b -HEAD is now at 457fdc0 initial -[detached HEAD b70fe52] altfile +HEAD is now at 1b7461d initial +[detached HEAD 6d821e0] altfile Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 alt_file.txt Warning: you are leaving 1 commit behind, not connected to any of your branches: - b70fe52 altfile + 6d821e0 altfile If you want to keep it by creating a new branch, this may be a good time to do so with: - git branch b70fe52 + git branch 6d821e0 -HEAD is now at 457fdc0 initial -[detached HEAD 0f8ecea] newfile +HEAD is now at 1b7461d initial +[detached HEAD 2f8a3e6] newfile Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 new_file.txt -From /tmp/tmpbghn3szy/remote +From /tmp/tmpuj7w1in6/remote * [new branch] alt_branch -> origin/alt_branch -From /tmp/tmpbghn3szy/remote +From /tmp/tmpuj7w1in6/remote * [new tag] new_tag -> new_tag -Initialized empty Git repository in /tmp/tmpdi_0uz_q/remote/.git/ -[master (root-commit) 457fdc0] initial +Initialized empty Git repository in /tmp/tmpmdvbuisc/remote/.git/ +[master (root-commit) 99a9ff7] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master a800f94] initial +[master 687a9cc] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master e5df454] modified +[master 9d99177] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt -Cloning into '/tmp/tmpdi_0uz_q/ros'... +Cloning into '/tmp/tmpmdvbuisc/ros'... done. rm 'deleted.txt' ok @@ -3157,150 +3193,150 @@ testDiffRelpath (test.test_git.GitDiffStatClientTest) ... ok testStatus (test.test_git.GitDiffStatClientTest) ... ok testStatusRelPath (test.test_git.GitDiffStatClientTest) ... ok -testStatusUntracked (test.test_git.GitDiffStatClientTest) ... Initialized empty Git repository in /tmp/tmp7qiiq306/remote/.git/ -[master (root-commit) 83d6015] initial +testStatusUntracked (test.test_git.GitDiffStatClientTest) ... Initialized empty Git repository in /tmp/tmpubgp2m6v/remote/.git/ +[master (root-commit) 99a9ff7] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master a7e65d4] initial +[master 8f6291c] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 74d4510] modified +[master c680576] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt -Cloning into '/tmp/tmp7qiiq306/ros'... +Cloning into '/tmp/tmpubgp2m6v/ros'... done. ok -testExportRepository (test.test_git.GitExportClientTest) ... Cloning into '/tmp/tmpx2pftvj2'... +testExportRepository (test.test_git.GitExportClientTest) ... Cloning into '/tmp/tmp8ubf9ycj'... warning: --depth is ignored in local clones; use file:// instead. done. -Initialized empty Git repository in /tmp/tmpcylqscnx/remote/.git/ -[master (root-commit) 83d6015] initial +Initialized empty Git repository in /tmp/tmpj6eta8n6/remote/.git/ +[master (root-commit) 81857de] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master a7e65d4] initial +[master 84aa3b6] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 74d4510] modified +[master af4dd44] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt ok -testGetBranches (test.test_git.GitGetBranchesClientTest) ... Cloning into '/tmp/tmpcylqscnx/ros'... +testGetBranches (test.test_git.GitGetBranchesClientTest) ... Cloning into '/tmp/tmpj6eta8n6/ros'... done. -Initialized empty Git repository in /tmp/tmpk09h5qd7/remote/.git/ -[master (root-commit) 2ef3830] initial +Initialized empty Git repository in /tmp/tmpzyduajcy/remote/.git/ +[master (root-commit) 040473e] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master a839f1d] initial +[master 5eba33f] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 97f4455] modified +[master 1c54601] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt create mode 100644 deleted.txt ok -test_get_default_remote_version_label (test.test_git.GitSwitchDefaultBranchTest) ... Cloning into '/tmp/tmpk09h5qd7/ros'... +test_get_default_remote_version_label (test.test_git.GitSwitchDefaultBranchTest) ... Cloning into '/tmp/tmpzyduajcy/ros'... done. ok -test_checkout_timeout (test.test_git.GitTimeoutTest) ... Cloning into '/tmp/tmpmoct2bie/ros'... +test_checkout_timeout (test.test_git.GitTimeoutTest) ... Cloning into '/tmp/tmpo4azkwr_/ros'... error: cannot run ssh: No such file or directory fatal: unable to fork -Initialized empty Git repository in /tmp/tmp_cn5bl0a/remote/.git/ -[master (root-commit) 2ef3830] initial +Initialized empty Git repository in /tmp/tmpat7l_b1j/remote/.git/ +[master (root-commit) 040473e] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -Initialized empty Git repository in /tmp/tmp_cn5bl0a/submodule/.git/ -[master (root-commit) 47b1e89] initial +Initialized empty Git repository in /tmp/tmpat7l_b1j/submodule/.git/ +[master (root-commit) ecd80aa] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 subfixed.txt -Initialized empty Git repository in /tmp/tmp_cn5bl0a/subsubmodule/.git/ -[master (root-commit) ef10f34] initial +Initialized empty Git repository in /tmp/tmpat7l_b1j/subsubmodule/.git/ +[master (root-commit) 83b53d4] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 subsubfixed.txt -Cloning into '/tmp/tmp_cn5bl0a/submodule/subsubmodule'... +Cloning into '/tmp/tmpat7l_b1j/submodule/subsubmodule'... done. -[master d1d0d14] subsubmodule +[master bf3f33e] subsubmodule Author: Your Name 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 subsubmodule Switched to a new branch 'test_branch' -Cloning into '/tmp/tmp_cn5bl0a/remote/submodule2'... +Cloning into '/tmp/tmpat7l_b1j/remote/submodule2'... done. -[test_branch 6cea4e3] submodule +[test_branch 5742280] submodule Author: Your Name 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 submodule2 warning: unable to rmdir 'submodule2': Directory not empty Switched to branch 'master' -Cloning into '/tmp/tmp_cn5bl0a/remote/submodule'... +Cloning into '/tmp/tmpat7l_b1j/remote/submodule'... done. -[master 8016d0e] submodule +[master 5ebf885] submodule Author: Your Name 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 submodule ok -test_checkout_branch_without_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp_cn5bl0a/local'... +test_checkout_branch_without_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpat7l_b1j/local'... done. ok -test_checkout_master_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp_cn5bl0a/local'... +test_checkout_master_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpat7l_b1j/local'... done. -Submodule 'submodule' (/tmp/tmp_cn5bl0a/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp_cn5bl0a/local/submodule'... +Submodule 'submodule' (/tmp/tmpat7l_b1j/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpat7l_b1j/local/submodule'... done. -Submodule path 'submodule': checked out 'd1d0d14246e1e2e57d55b16e3d25ae0bfd5129b8' -Submodule 'subsubmodule' (/tmp/tmp_cn5bl0a/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp_cn5bl0a/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out 'bf3f33e960794124ccea142a9151e717e9685918' +Submodule 'subsubmodule' (/tmp/tmpat7l_b1j/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpat7l_b1j/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'ef10f34d6756b1d72b04a06ab82189d5af95b031' +Submodule path 'submodule/subsubmodule': checked out '83b53d43e58fc4a8ae73f20303d7ef87c43e6848' ok -test_checkout_master_with_subs2 (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp_cn5bl0a/local'... +test_checkout_master_with_subs2 (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpat7l_b1j/local'... done. ok -test_checkout_test_branch_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp_cn5bl0a/local'... +test_checkout_test_branch_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpat7l_b1j/local'... done. ok -test_diff (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp_cn5bl0a/local'... +test_diff (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpat7l_b1j/local'... done. -Submodule 'submodule' (/tmp/tmp_cn5bl0a/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp_cn5bl0a/local/submodule'... +Submodule 'submodule' (/tmp/tmpat7l_b1j/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpat7l_b1j/local/submodule'... done. -Submodule path 'submodule': checked out 'd1d0d14246e1e2e57d55b16e3d25ae0bfd5129b8' -Submodule 'subsubmodule' (/tmp/tmp_cn5bl0a/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp_cn5bl0a/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out 'bf3f33e960794124ccea142a9151e717e9685918' +Submodule 'subsubmodule' (/tmp/tmpat7l_b1j/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpat7l_b1j/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'ef10f34d6756b1d72b04a06ab82189d5af95b031' +Submodule path 'submodule/subsubmodule': checked out '83b53d43e58fc4a8ae73f20303d7ef87c43e6848' ok -test_export_branch (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp_cn5bl0a/local'... +test_export_branch (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpat7l_b1j/local'... done. -Cloning into '/tmp/tmp_vi5yifm'... +Cloning into '/tmp/tmp9lhol0_4'... warning: --depth is ignored in local clones; use file:// instead. done. ok -test_export_hash (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp_cn5bl0a/local'... +test_export_hash (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpat7l_b1j/local'... done. -Cloning into '/tmp/tmpgnijpp_g'... +Cloning into '/tmp/tmpb1d5ubd1'... warning: --depth is ignored in local clones; use file:// instead. done. -Note: checking out '6cea4e37c2cc5bf735196a4fc62397ac863f7bee'. +Note: checking out '57422804b1f98be116e997068dbcece1d007f664'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this @@ -3312,57 +3348,57 @@ git checkout -b ok -test_export_master (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp_cn5bl0a/local'... +test_export_master (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpat7l_b1j/local'... done. -Submodule 'submodule' (/tmp/tmp_cn5bl0a/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp_cn5bl0a/local/submodule'... +Submodule 'submodule' (/tmp/tmpat7l_b1j/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpat7l_b1j/local/submodule'... done. -Submodule path 'submodule': checked out 'd1d0d14246e1e2e57d55b16e3d25ae0bfd5129b8' -Submodule 'subsubmodule' (/tmp/tmp_cn5bl0a/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp_cn5bl0a/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out 'bf3f33e960794124ccea142a9151e717e9685918' +Submodule 'subsubmodule' (/tmp/tmpat7l_b1j/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpat7l_b1j/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'ef10f34d6756b1d72b04a06ab82189d5af95b031' -Cloning into '/tmp/tmpb2x42g2n'... +Submodule path 'submodule/subsubmodule': checked out '83b53d43e58fc4a8ae73f20303d7ef87c43e6848' +Cloning into '/tmp/tmpvi7o_53x'... warning: --depth is ignored in local clones; use file:// instead. done. ok -test_status (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp_cn5bl0a/local'... +test_status (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpat7l_b1j/local'... done. -Submodule 'submodule' (/tmp/tmp_cn5bl0a/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp_cn5bl0a/local/submodule'... +Submodule 'submodule' (/tmp/tmpat7l_b1j/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpat7l_b1j/local/submodule'... done. -Submodule path 'submodule': checked out 'd1d0d14246e1e2e57d55b16e3d25ae0bfd5129b8' -Submodule 'subsubmodule' (/tmp/tmp_cn5bl0a/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp_cn5bl0a/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out 'bf3f33e960794124ccea142a9151e717e9685918' +Submodule 'subsubmodule' (/tmp/tmpat7l_b1j/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpat7l_b1j/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'ef10f34d6756b1d72b04a06ab82189d5af95b031' +Submodule path 'submodule/subsubmodule': checked out '83b53d43e58fc4a8ae73f20303d7ef87c43e6848' ok -test_switch_branches (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp_cn5bl0a/local'... +test_switch_branches (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpat7l_b1j/local'... done. -Submodule 'submodule' (/tmp/tmp_cn5bl0a/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp_cn5bl0a/local/submodule'... +Submodule 'submodule' (/tmp/tmpat7l_b1j/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpat7l_b1j/local/submodule'... done. -Submodule path 'submodule': checked out 'd1d0d14246e1e2e57d55b16e3d25ae0bfd5129b8' -Submodule 'subsubmodule' (/tmp/tmp_cn5bl0a/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp_cn5bl0a/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out 'bf3f33e960794124ccea142a9151e717e9685918' +Submodule 'subsubmodule' (/tmp/tmpat7l_b1j/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpat7l_b1j/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'ef10f34d6756b1d72b04a06ab82189d5af95b031' +Submodule path 'submodule/subsubmodule': checked out '83b53d43e58fc4a8ae73f20303d7ef87c43e6848' ok -test_switch_branches_retrieve_local_subcommit (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp_cn5bl0a/local'... +test_switch_branches_retrieve_local_subcommit (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpat7l_b1j/local'... done. -Submodule 'submodule' (/tmp/tmp_cn5bl0a/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp_cn5bl0a/local/submodule'... +Submodule 'submodule' (/tmp/tmpat7l_b1j/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpat7l_b1j/local/submodule'... done. -Submodule path 'submodule': checked out 'd1d0d14246e1e2e57d55b16e3d25ae0bfd5129b8' -Submodule 'subsubmodule' (/tmp/tmp_cn5bl0a/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp_cn5bl0a/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out 'bf3f33e960794124ccea142a9151e717e9685918' +Submodule 'subsubmodule' (/tmp/tmpat7l_b1j/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpat7l_b1j/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'ef10f34d6756b1d72b04a06ab82189d5af95b031' -[detached HEAD e67e579] submodif +Submodule path 'submodule/subsubmodule': checked out '83b53d43e58fc4a8ae73f20303d7ef87c43e6848' +[detached HEAD 163cfe2] submodif Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 submodif.txt -[test_branch 4a3450c] submodule2_modif +[test_branch 10f025d] submodule2_modif Author: Your Name 1 file changed, 1 insertion(+), 1 deletion(-) marked working directory as branch test_branch @@ -3370,13 +3406,13 @@ updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_get_log_defaults (test.test_hg.HGAffectedFilesTest) ... abort: destination '/tmp/tmp9ujhnktq/local' is not empty +test_get_log_defaults (test.test_hg.HGAffectedFilesTest) ... abort: destination '/tmp/tmpgalnr4h3/local' is not empty marked working directory as branch test_branch (branches are permanent and global, did you want a bookmark?) updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_get_log_defaults (test.test_hg.HGClientLogTest) ... abort: destination '/tmp/tmp7jo8q33j/local' is not empty +test_get_log_defaults (test.test_hg.HGClientLogTest) ... abort: destination '/tmp/tmprshas29w/local' is not empty ok test_get_log_limit (test.test_hg.HGClientLogTest) ... updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -3393,7 +3429,7 @@ ok test_checkout_dir_exists (test.test_hg.HGClientTest) ... updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -abort: destination '/tmp/tmpgsas9q1h/local' is not empty +abort: destination '/tmp/tmpcep5id62/local' is not empty ok test_checkout_emptystringversion (test.test_hg.HGClientTest) ... updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -3404,19 +3440,19 @@ test_checkout_specific_version_and_update (test.test_hg.HGClientTest) ... updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpgsas9q1h/remote +pulling from /tmp/tmpcep5id62/remote searching for changes no changes found 0 files updated, 0 files merged, 2 files removed, 0 files unresolved -pulling from /tmp/tmpgsas9q1h/remote +pulling from /tmp/tmpcep5id62/remote searching for changes no changes found 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpgsas9q1h/remote +pulling from /tmp/tmpcep5id62/remote searching for changes no changes found 0 files updated, 0 files merged, 2 files removed, 0 files unresolved -pulling from /tmp/tmpgsas9q1h/remote +pulling from /tmp/tmpcep5id62/remote searching for changes no changes found 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -3424,11 +3460,11 @@ test_get_current_version_label (test.test_hg.HGClientTest) ... updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 5 files removed, 0 files unresolved -pulling from /tmp/tmpgsas9q1h/remote +pulling from /tmp/tmpcep5id62/remote searching for changes no changes found 5 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpgsas9q1h/remote +pulling from /tmp/tmpcep5id62/remote searching for changes no changes found 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -3436,12 +3472,12 @@ test_get_environment_metadata (test.test_hg.HGClientTest) ... ok test_get_remote_version (test.test_hg.HGClientTest) ... updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -abort: destination '/tmp/tmpgsas9q1h/local' is not empty -pulling from /tmp/tmpgsas9q1h/remote +abort: destination '/tmp/tmpcep5id62/local' is not empty +pulling from /tmp/tmpcep5id62/remote searching for changes no changes found 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpgsas9q1h/remote +pulling from /tmp/tmpcep5id62/remote searching for changes no changes found 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -3472,17 +3508,17 @@ updating to branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_get_branches (test.test_hg.HGGetBranchesClientTest) ... pulling from /tmp/tmpyzverogj/remote +test_get_branches (test.test_hg.HGGetBranchesClientTest) ... pulling from /tmp/tmp6rmqlj1_/remote searching for changes no changes found fixed.txt already tracked! -pulling from /tmp/tmpyzverogj/remote +pulling from /tmp/tmp6rmqlj1_/remote searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files -new changesets 86c1dc1bede5 +new changesets 3b6409fef270 (run 'hg update' to get a working copy) marked working directory as branch test_branch (branches are permanent and global, did you want a bookmark?) @@ -3524,14 +3560,14 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpvommml9m/local/deleted-fs.txt -A /tmp/tmpvommml9m/local/deleted.txt -A /tmp/tmpvommml9m/local/fixed.txt -A /tmp/tmpvommml9m/local/modified-fs.txt -A /tmp/tmpvommml9m/local/modified.txt +A /tmp/tmpy0cubbq_/local/deleted-fs.txt +A /tmp/tmpy0cubbq_/local/deleted.txt +A /tmp/tmpy0cubbq_/local/fixed.txt +A /tmp/tmpy0cubbq_/local/modified-fs.txt +A /tmp/tmpy0cubbq_/local/modified.txt Checked out revision 4. ok -test_get_affected_files (test.test_svn.SVNClientAffectedFiles) ... ERROR [vcstools] Can't remove /tmp/tmpvommml9m/local[/vcstools] +test_get_affected_files (test.test_svn.SVNClientAffectedFiles) ... ERROR [vcstools] Can't remove /tmp/tmpy0cubbq_/local[/vcstools] Checked out revision 0. A trunk A branches @@ -3565,27 +3601,27 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpzycs2rqa/local/deleted-fs.txt -A /tmp/tmpzycs2rqa/local/deleted.txt -A /tmp/tmpzycs2rqa/local/fixed.txt -A /tmp/tmpzycs2rqa/local/modified-fs.txt -A /tmp/tmpzycs2rqa/local/modified.txt -Checked out revision 4. -ok -test_get_log_defaults (test.test_svn.SvnClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmpzycs2rqa/local[/vcstools] -ok -test_get_log_limit (test.test_svn.SvnClientLogTest) ... A /tmp/tmpzycs2rqa/local/deleted-fs.txt -A /tmp/tmpzycs2rqa/local/deleted.txt -A /tmp/tmpzycs2rqa/local/fixed.txt -A /tmp/tmpzycs2rqa/local/modified-fs.txt -A /tmp/tmpzycs2rqa/local/modified.txt -Checked out revision 4. -ok -test_get_log_path (test.test_svn.SvnClientLogTest) ... A /tmp/tmpzycs2rqa/local/deleted-fs.txt -A /tmp/tmpzycs2rqa/local/deleted.txt -A /tmp/tmpzycs2rqa/local/fixed.txt -A /tmp/tmpzycs2rqa/local/modified-fs.txt -A /tmp/tmpzycs2rqa/local/modified.txt +A /tmp/tmpx9_wxe5o/local/deleted-fs.txt +A /tmp/tmpx9_wxe5o/local/deleted.txt +A /tmp/tmpx9_wxe5o/local/fixed.txt +A /tmp/tmpx9_wxe5o/local/modified-fs.txt +A /tmp/tmpx9_wxe5o/local/modified.txt +Checked out revision 4. +ok +test_get_log_defaults (test.test_svn.SvnClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmpx9_wxe5o/local[/vcstools] +ok +test_get_log_limit (test.test_svn.SvnClientLogTest) ... A /tmp/tmpx9_wxe5o/local/deleted-fs.txt +A /tmp/tmpx9_wxe5o/local/deleted.txt +A /tmp/tmpx9_wxe5o/local/fixed.txt +A /tmp/tmpx9_wxe5o/local/modified-fs.txt +A /tmp/tmpx9_wxe5o/local/modified.txt +Checked out revision 4. +ok +test_get_log_path (test.test_svn.SvnClientLogTest) ... A /tmp/tmpx9_wxe5o/local/deleted-fs.txt +A /tmp/tmpx9_wxe5o/local/deleted.txt +A /tmp/tmpx9_wxe5o/local/fixed.txt +A /tmp/tmpx9_wxe5o/local/modified-fs.txt +A /tmp/tmpx9_wxe5o/local/modified.txt Checked out revision 4. Checked out revision 0. A trunk @@ -3622,66 +3658,66 @@ Committed revision 4. ok testDiffClean (test.test_svn.SvnClientTest) ... WARNING [vcstools] Command failed: 'svn diff "."' - run at: '/tmp/tmpp5ve3zn6/remote' + run at: '/tmp/tmp__u0pmc_/remote' errcode: 1: -svn: E155007: '/tmp/tmpp5ve3zn6/remote' is not a working copy +svn: E155007: '/tmp/tmp__u0pmc_/remote' is not a working copy [/vcstools] ok testStatusClean (test.test_svn.SvnClientTest) ... ok -test_checkout (test.test_svn.SvnClientTest) ... A /tmp/tmpp5ve3zn6/local/deleted-fs.txt -A /tmp/tmpp5ve3zn6/local/deleted.txt -A /tmp/tmpp5ve3zn6/local/fixed.txt -A /tmp/tmpp5ve3zn6/local/modified-fs.txt -A /tmp/tmpp5ve3zn6/local/modified.txt -Checked out revision 4. -ok -test_checkout_dir_exists (test.test_svn.SvnClientTest) ... A /tmp/tmpp5ve3zn6/local/deleted-fs.txt -A /tmp/tmpp5ve3zn6/local/deleted.txt -A /tmp/tmpp5ve3zn6/local/fixed.txt -A /tmp/tmpp5ve3zn6/local/modified-fs.txt -A /tmp/tmpp5ve3zn6/local/modified.txt -Checked out revision 4. -ERROR [vcstools] Can't remove /tmp/tmpp5ve3zn6/local[/vcstools] -ok -test_checkout_emptyversion (test.test_svn.SvnClientTest) ... A /tmp/tmpp5ve3zn6/local/deleted-fs.txt -A /tmp/tmpp5ve3zn6/local/deleted.txt -A /tmp/tmpp5ve3zn6/local/fixed.txt -A /tmp/tmpp5ve3zn6/local/modified-fs.txt -A /tmp/tmpp5ve3zn6/local/modified.txt +test_checkout (test.test_svn.SvnClientTest) ... A /tmp/tmp__u0pmc_/local/deleted-fs.txt +A /tmp/tmp__u0pmc_/local/deleted.txt +A /tmp/tmp__u0pmc_/local/fixed.txt +A /tmp/tmp__u0pmc_/local/modified-fs.txt +A /tmp/tmp__u0pmc_/local/modified.txt +Checked out revision 4. +ok +test_checkout_dir_exists (test.test_svn.SvnClientTest) ... A /tmp/tmp__u0pmc_/local/deleted-fs.txt +A /tmp/tmp__u0pmc_/local/deleted.txt +A /tmp/tmp__u0pmc_/local/fixed.txt +A /tmp/tmp__u0pmc_/local/modified-fs.txt +A /tmp/tmp__u0pmc_/local/modified.txt +Checked out revision 4. +ERROR [vcstools] Can't remove /tmp/tmp__u0pmc_/local[/vcstools] +ok +test_checkout_emptyversion (test.test_svn.SvnClientTest) ... A /tmp/tmp__u0pmc_/local/deleted-fs.txt +A /tmp/tmp__u0pmc_/local/deleted.txt +A /tmp/tmp__u0pmc_/local/fixed.txt +A /tmp/tmp__u0pmc_/local/modified-fs.txt +A /tmp/tmp__u0pmc_/local/modified.txt Checked out revision 4. -Updating '/tmp/tmpp5ve3zn6/local': +Updating '/tmp/tmp__u0pmc_/local': At revision 4. -Updating '/tmp/tmpp5ve3zn6/local': +Updating '/tmp/tmp__u0pmc_/local': At revision 4. ok -using just a number as version ... A /tmp/tmpp5ve3zn6/local/deleted-fs.txt -A /tmp/tmpp5ve3zn6/local/deleted.txt -A /tmp/tmpp5ve3zn6/local/fixed.txt -A /tmp/tmpp5ve3zn6/local/modified-fs.txt -A /tmp/tmpp5ve3zn6/local/modified.txt +using just a number as version ... A /tmp/tmp__u0pmc_/local/deleted-fs.txt +A /tmp/tmp__u0pmc_/local/deleted.txt +A /tmp/tmp__u0pmc_/local/fixed.txt +A /tmp/tmp__u0pmc_/local/modified-fs.txt +A /tmp/tmp__u0pmc_/local/modified.txt Checked out revision 3. -Updating '/tmp/tmpp5ve3zn6/local': -D /tmp/tmpp5ve3zn6/local/deleted.txt -D /tmp/tmpp5ve3zn6/local/deleted-fs.txt +Updating '/tmp/tmp__u0pmc_/local': +D /tmp/tmp__u0pmc_/local/deleted.txt +D /tmp/tmp__u0pmc_/local/deleted-fs.txt Updated to revision 2. ok test_get_environment_metadata (test.test_svn.SvnClientTest) ... ok -test_get_remote_branch_version (test.test_svn.SvnClientTest) ... A /tmp/tmpp5ve3zn6/local/modified.txt +test_get_remote_branch_version (test.test_svn.SvnClientTest) ... A /tmp/tmp__u0pmc_/local/modified.txt Checked out revision 4. ok -test_get_remote_version (test.test_svn.SvnClientTest) ... A /tmp/tmpp5ve3zn6/local/deleted-fs.txt -A /tmp/tmpp5ve3zn6/local/deleted.txt -A /tmp/tmpp5ve3zn6/local/fixed.txt -A /tmp/tmpp5ve3zn6/local/modified-fs.txt -A /tmp/tmpp5ve3zn6/local/modified.txt +test_get_remote_version (test.test_svn.SvnClientTest) ... A /tmp/tmp__u0pmc_/local/deleted-fs.txt +A /tmp/tmp__u0pmc_/local/deleted.txt +A /tmp/tmp__u0pmc_/local/fixed.txt +A /tmp/tmp__u0pmc_/local/modified-fs.txt +A /tmp/tmp__u0pmc_/local/modified.txt Checked out revision 4. ok test_get_type_name (test.test_svn.SvnClientTest) ... ok -test_get_url_by_reading (test.test_svn.SvnClientTest) ... A /tmp/tmpp5ve3zn6/local/deleted-fs.txt -A /tmp/tmpp5ve3zn6/local/deleted.txt -A /tmp/tmpp5ve3zn6/local/fixed.txt -A /tmp/tmpp5ve3zn6/local/modified-fs.txt -A /tmp/tmpp5ve3zn6/local/modified.txt +test_get_url_by_reading (test.test_svn.SvnClientTest) ... A /tmp/tmp__u0pmc_/local/deleted-fs.txt +A /tmp/tmp__u0pmc_/local/deleted.txt +A /tmp/tmp__u0pmc_/local/fixed.txt +A /tmp/tmp__u0pmc_/local/modified-fs.txt +A /tmp/tmp__u0pmc_/local/modified.txt Checked out revision 4. ok test_get_url_nonexistant (test.test_svn.SvnClientTest) ... ok @@ -3718,11 +3754,11 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpltwaieft/local/deleted-fs.txt -A /tmp/tmpltwaieft/local/deleted.txt -A /tmp/tmpltwaieft/local/fixed.txt -A /tmp/tmpltwaieft/local/modified-fs.txt -A /tmp/tmpltwaieft/local/modified.txt +A /tmp/tmpkm396s4p/local/deleted-fs.txt +A /tmp/tmpkm396s4p/local/deleted.txt +A /tmp/tmpkm396s4p/local/fixed.txt +A /tmp/tmpkm396s4p/local/modified-fs.txt +A /tmp/tmpkm396s4p/local/modified.txt Checked out revision 4. D deleted.txt A added.txt @@ -3764,11 +3800,11 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpd5k1pepg/local/deleted-fs.txt -A /tmp/tmpd5k1pepg/local/deleted.txt -A /tmp/tmpd5k1pepg/local/fixed.txt -A /tmp/tmpd5k1pepg/local/modified-fs.txt -A /tmp/tmpd5k1pepg/local/modified.txt +A /tmp/tmpo1xafaf0/local/deleted-fs.txt +A /tmp/tmpo1xafaf0/local/deleted.txt +A /tmp/tmpo1xafaf0/local/fixed.txt +A /tmp/tmpo1xafaf0/local/modified-fs.txt +A /tmp/tmpo1xafaf0/local/modified.txt Checked out revision 4. ok test_export_repository (test.test_svn.SvnExportRepositoryClientTest) ... Checked out revision 0. @@ -3804,11 +3840,11 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmplejudgw9/local/deleted-fs.txt -A /tmp/tmplejudgw9/local/deleted.txt -A /tmp/tmplejudgw9/local/fixed.txt -A /tmp/tmplejudgw9/local/modified-fs.txt -A /tmp/tmplejudgw9/local/modified.txt +A /tmp/tmp8tqirk7y/local/deleted-fs.txt +A /tmp/tmp8tqirk7y/local/deleted.txt +A /tmp/tmp8tqirk7y/local/fixed.txt +A /tmp/tmp8tqirk7y/local/modified-fs.txt +A /tmp/tmp8tqirk7y/local/modified.txt Checked out revision 4. ok test_get_branches (test.test_svn.SvnGetBranchesClientTest) ... A branches/foo2 @@ -3817,7 +3853,7 @@ Adding branches/foo2 Committing transaction... Committed revision 5. -A /tmp/tmplejudgw9/local_foo/modified.txt +A /tmp/tmp8tqirk7y/local_foo/modified.txt Checked out revision 5. ok test_get_branches_non_canonical (test.test_svn.SvnGetBranchesClientTest) ... Checked out revision 0. @@ -3830,8 +3866,8 @@ Transmitting file data .done Committing transaction... Committed revision 1. -A /tmp/tmplejudgw9/local_nc/foosub -A /tmp/tmplejudgw9/local_nc/foosub/fixed.txt +A /tmp/tmp8tqirk7y/local_nc/foosub +A /tmp/tmp8tqirk7y/local_nc/foosub/fixed.txt Checked out revision 1. ok test_get_remote_contents (test.test_svn.SvnGetBranchesClientTest) ... ok @@ -3849,7 +3885,7 @@ test_register_vcs (test.test_vcs_abstraction.TestVcsAbstraction) ... ok ---------------------------------------------------------------------- -Ran 147 tests in 97.216s +Ran 147 tests in 187.320s OK create-stamp debian/debhelper-build-stamp @@ -3994,12 +4030,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: not including original source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/1502946/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/1502946/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/1297525 and its subdirectories -I: Current time: Mon Oct 2 15:04:17 -12 2023 -I: pbuilder-time-stamp: 1696302257 +I: removing directory /srv/workspace/pbuilder/1502946 and its subdirectories +I: Current time: Wed Aug 31 10:50:30 +14 2022 +I: pbuilder-time-stamp: 1661892630