Diff of the two buildlogs: -- --- b1/build.log 2020-09-28 04:48:32.075376198 +0000 +++ b2/build.log 2020-09-28 05:04:11.027424349 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Sun Sep 27 16:19:42 -12 2020 -I: pbuilder-time-stamp: 1601266782 +I: Current time: Mon Sep 28 18:48:48 +14 2020 +I: pbuilder-time-stamp: 1601268528 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,170 @@ 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/19803/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/23763/tmp/hooks/D01_modify_environment starting +debug: Running on ff64a. +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' +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/23763/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/23763/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='armhf' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=3' - DISTRIBUTION='' - HOME='/root' - HOST_ARCH='armhf' + 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]="arm-unknown-linux-gnueabihf") + 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=armhf + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=6' + DIRSTACK=() + DISTRIBUTION= + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=arm + HOST_ARCH=armhf IFS=' ' - INVOCATION_ID='3e60f5ddb057424d96cac07dd003ead8' - 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='19803' - PS1='# ' - PS2='> ' + INVOCATION_ID=431e87ba317d444d964ae379540da3ae + LANG=C + LANGUAGE=it_CH:it + LC_ALL=C + MACHTYPE=arm-unknown-linux-gnueabihf + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnueabihf + 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=23763 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.u2EOu97xAF/pbuilderrc_auCp --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.u2EOu97xAF/b1 --logfile b1/build.log ros-vcstools_0.1.40-2.dsc' - SUDO_GID='113' - SUDO_UID='107' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://10.0.0.15:8000/' + 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.u2EOu97xAF/pbuilderrc_wr4I --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.u2EOu97xAF/b2 --logfile b2/build.log ros-vcstools_0.1.40-2.dsc' + SUDO_GID=114 + SUDO_UID=109 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://10.0.0.15:8000/ I: uname -a - Linux jtk1a 4.19.0-11-armmp-lpae #1 SMP Debian 4.19.146-1 (2020-09-17) armv7l GNU/Linux + Linux i-capture-the-hostname 4.19.0-11-arm64 #1 SMP Debian 4.19.146-1 (2020-09-17) aarch64 GNU/Linux I: ls -l /bin total 3328 - -rwxr-xr-x 1 root root 767656 Apr 17 2019 bash - -rwxr-xr-x 3 root root 26052 Jul 10 2019 bunzip2 - -rwxr-xr-x 3 root root 26052 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 26052 Jul 10 2019 bzip2 - -rwxr-xr-x 1 root root 9636 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 22432 Feb 28 2019 cat - -rwxr-xr-x 1 root root 38868 Feb 28 2019 chgrp - -rwxr-xr-x 1 root root 38836 Feb 28 2019 chmod - -rwxr-xr-x 1 root root 42972 Feb 28 2019 chown - -rwxr-xr-x 1 root root 88376 Feb 28 2019 cp - -rwxr-xr-x 1 root root 75516 Jan 17 2019 dash - -rwxr-xr-x 1 root root 71648 Feb 28 2019 date - -rwxr-xr-x 1 root root 51212 Feb 28 2019 dd - -rwxr-xr-x 1 root root 55672 Feb 28 2019 df - -rwxr-xr-x 1 root root 88444 Feb 28 2019 dir - -rwxr-xr-x 1 root root 54872 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 22364 Feb 28 2019 echo - -rwxr-xr-x 1 root root 28 Jan 7 2019 egrep - -rwxr-xr-x 1 root root 18260 Feb 28 2019 false - -rwxr-xr-x 1 root root 28 Jan 7 2019 fgrep - -rwxr-xr-x 1 root root 47356 Jan 9 2019 findmnt - -rwsr-xr-x 1 root root 21980 Apr 22 07:38 fusermount - -rwxr-xr-x 1 root root 124508 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 64232 Jan 5 2019 gzip - -rwxr-xr-x 1 root root 13784 Sep 26 2018 hostname - -rwxr-xr-x 1 root root 43044 Feb 28 2019 ln - -rwxr-xr-x 1 root root 34932 Jul 26 2018 login - -rwxr-xr-x 1 root root 88444 Feb 28 2019 ls - -rwxr-xr-x 1 root root 67036 Jan 9 2019 lsblk - -rwxr-xr-x 1 root root 47168 Feb 28 2019 mkdir - -rwxr-xr-x 1 root root 43040 Feb 28 2019 mknod - -rwxr-xr-x 1 root root 26552 Feb 28 2019 mktemp - -rwxr-xr-x 1 root root 26024 Jan 9 2019 more - -rwsr-xr-x 1 root root 34268 Jan 9 2019 mount - -rwxr-xr-x 1 root root 9688 Jan 9 2019 mountpoint - -rwxr-xr-x 1 root root 84284 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 22416 Feb 28 2019 pwd - lrwxrwxrwx 1 root root 4 Apr 17 2019 rbash -> bash - -rwxr-xr-x 1 root root 26504 Feb 28 2019 readlink - -rwxr-xr-x 1 root root 42968 Feb 28 2019 rm - -rwxr-xr-x 1 root root 26496 Feb 28 2019 rmdir - -rwxr-xr-x 1 root root 14136 Jan 21 2019 run-parts - -rwxr-xr-x 1 root root 76012 Dec 22 2018 sed - lrwxrwxrwx 1 root root 4 Sep 20 20:27 sh -> dash - -rwxr-xr-x 1 root root 22384 Feb 28 2019 sleep - -rwxr-xr-x 1 root root 51124 Feb 28 2019 stty - -rwsr-xr-x 1 root root 42472 Jan 9 2019 su - -rwxr-xr-x 1 root root 22392 Feb 28 2019 sync - -rwxr-xr-x 1 root root 283324 Apr 23 2019 tar - -rwxr-xr-x 1 root root 9808 Jan 21 2019 tempfile - -rwxr-xr-x 1 root root 63464 Feb 28 2019 touch - -rwxr-xr-x 1 root root 18260 Feb 28 2019 true - -rwxr-xr-x 1 root root 9636 Apr 22 07:38 ulockmgr_server - -rwsr-xr-x 1 root root 21976 Jan 9 2019 umount - -rwxr-xr-x 1 root root 22380 Feb 28 2019 uname - -rwxr-xr-x 2 root root 2345 Jan 5 2019 uncompress - -rwxr-xr-x 1 root root 88444 Feb 28 2019 vdir - -rwxr-xr-x 1 root root 21980 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/19803/tmp/hooks/D02_print_environment finished + -rwxr-xr-x 1 root root 767656 Apr 18 2019 bash + -rwxr-xr-x 3 root root 26052 Jul 11 2019 bunzip2 + -rwxr-xr-x 3 root root 26052 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 26052 Jul 11 2019 bzip2 + -rwxr-xr-x 1 root root 9636 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 22432 Mar 1 2019 cat + -rwxr-xr-x 1 root root 38868 Mar 1 2019 chgrp + -rwxr-xr-x 1 root root 38836 Mar 1 2019 chmod + -rwxr-xr-x 1 root root 42972 Mar 1 2019 chown + -rwxr-xr-x 1 root root 88376 Mar 1 2019 cp + -rwxr-xr-x 1 root root 75516 Jan 18 2019 dash + -rwxr-xr-x 1 root root 71648 Mar 1 2019 date + -rwxr-xr-x 1 root root 51212 Mar 1 2019 dd + -rwxr-xr-x 1 root root 55672 Mar 1 2019 df + -rwxr-xr-x 1 root root 88444 Mar 1 2019 dir + -rwxr-xr-x 1 root root 54872 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 22364 Mar 1 2019 echo + -rwxr-xr-x 1 root root 28 Jan 8 2019 egrep + -rwxr-xr-x 1 root root 18260 Mar 1 2019 false + -rwxr-xr-x 1 root root 28 Jan 8 2019 fgrep + -rwxr-xr-x 1 root root 47356 Jan 10 2019 findmnt + -rwsr-xr-x 1 root root 21980 Apr 23 09:38 fusermount + -rwxr-xr-x 1 root root 124508 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 64232 Jan 6 2019 gzip + -rwxr-xr-x 1 root root 13784 Sep 27 2018 hostname + -rwxr-xr-x 1 root root 43044 Mar 1 2019 ln + -rwxr-xr-x 1 root root 34932 Jul 27 2018 login + -rwxr-xr-x 1 root root 88444 Mar 1 2019 ls + -rwxr-xr-x 1 root root 67036 Jan 10 2019 lsblk + -rwxr-xr-x 1 root root 47168 Mar 1 2019 mkdir + -rwxr-xr-x 1 root root 43040 Mar 1 2019 mknod + -rwxr-xr-x 1 root root 26552 Mar 1 2019 mktemp + -rwxr-xr-x 1 root root 26024 Jan 10 2019 more + -rwsr-xr-x 1 root root 34268 Jan 10 2019 mount + -rwxr-xr-x 1 root root 9688 Jan 10 2019 mountpoint + -rwxr-xr-x 1 root root 84284 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 22416 Mar 1 2019 pwd + lrwxrwxrwx 1 root root 4 Apr 18 2019 rbash -> bash + -rwxr-xr-x 1 root root 26504 Mar 1 2019 readlink + -rwxr-xr-x 1 root root 42968 Mar 1 2019 rm + -rwxr-xr-x 1 root root 26496 Mar 1 2019 rmdir + -rwxr-xr-x 1 root root 14136 Jan 22 2019 run-parts + -rwxr-xr-x 1 root root 76012 Dec 23 2018 sed + lrwxrwxrwx 1 root root 4 Sep 28 18:49 sh -> bash + lrwxrwxrwx 1 root root 4 Sep 21 22:24 sh.distrib -> dash + -rwxr-xr-x 1 root root 22384 Mar 1 2019 sleep + -rwxr-xr-x 1 root root 51124 Mar 1 2019 stty + -rwsr-xr-x 1 root root 42472 Jan 10 2019 su + -rwxr-xr-x 1 root root 22392 Mar 1 2019 sync + -rwxr-xr-x 1 root root 283324 Apr 24 2019 tar + -rwxr-xr-x 1 root root 9808 Jan 22 2019 tempfile + -rwxr-xr-x 1 root root 63464 Mar 1 2019 touch + -rwxr-xr-x 1 root root 18260 Mar 1 2019 true + -rwxr-xr-x 1 root root 9636 Apr 23 09:38 ulockmgr_server + -rwsr-xr-x 1 root root 21976 Jan 10 2019 umount + -rwxr-xr-x 1 root root 22380 Mar 1 2019 uname + -rwxr-xr-x 2 root root 2345 Jan 6 2019 uncompress + -rwxr-xr-x 1 root root 88444 Mar 1 2019 vdir + -rwxr-xr-x 1 root root 21980 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/23763/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -338,7 +372,7 @@ Get: 107 http://deb.debian.org/debian buster/main armhf python3-nose all 1.3.7-4 [132 kB] Get: 108 http://deb.debian.org/debian buster/main armhf python3-yaml armhf 3.13-2 [113 kB] Get: 109 http://deb.debian.org/debian buster/main armhf subversion armhf 1.10.4-1+deb10u1 [983 kB] -Fetched 45.4 MB in 7s (6923 kB/s) +Fetched 45.4 MB in 35s (1299 kB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libbsd0:armhf. (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 ... 18932 files and directories currently installed.) @@ -802,7 +836,7 @@ 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 +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 dpkg-buildpackage: info: source package ros-vcstools dpkg-buildpackage: info: source version 0.1.40-2 dpkg-buildpackage: info: source distribution unstable @@ -839,32 +873,32 @@ running build running build_py creating /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools -copying src/vcstools/svn.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools -copying src/vcstools/__version__.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools -copying src/vcstools/hg.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools -copying src/vcstools/vcs_base.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools -copying src/vcstools/tar.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools -copying src/vcstools/vcs_abstraction.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools copying src/vcstools/common.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools copying src/vcstools/bzr.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools +copying src/vcstools/vcs_base.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools +copying src/vcstools/vcs_abstraction.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools +copying src/vcstools/hg.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools copying src/vcstools/__init__.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools -copying src/vcstools/git_archive_all.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools +copying src/vcstools/__version__.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools copying src/vcstools/git.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools +copying src/vcstools/svn.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools +copying src/vcstools/git_archive_all.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools +copying src/vcstools/tar.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools I: pybuild base:217: /usr/bin/python3 setup.py build running build running build_py creating /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools -copying src/vcstools/svn.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools -copying src/vcstools/__version__.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools -copying src/vcstools/hg.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools -copying src/vcstools/vcs_base.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools -copying src/vcstools/tar.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools -copying src/vcstools/vcs_abstraction.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools copying src/vcstools/common.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools copying src/vcstools/bzr.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools +copying src/vcstools/vcs_base.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools +copying src/vcstools/vcs_abstraction.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools +copying src/vcstools/hg.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools copying src/vcstools/__init__.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools -copying src/vcstools/git_archive_all.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools +copying src/vcstools/__version__.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools copying src/vcstools/git.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools +copying src/vcstools/svn.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools +copying src/vcstools/git_archive_all.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools +copying src/vcstools/tar.py -> /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools dh_auto_test -O--buildsystem=pybuild I: pybuild base:217: cd /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build; python2.7 -m nose -v test test_netrc_open (test.test_base.BaseTest) ... ok @@ -872,11 +906,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 +920,82 @@ test_urlretrieve_netrc (test.test_base.BaseTest) ... ok Created a standalone tree (format: 2a) adding fixed.txt -Committing to: /tmp/tmpMZdx2b/remote/ +Committing to: /tmp/tmpQDcfjd/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmpMZdx2b/remote/ +Committing to: /tmp/tmpQDcfjd/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpMZdx2b/remote/ +Committing to: /tmp/tmpQDcfjd/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/tmpMZdx2b/local[/vcstools] +test_get_log_defaults (test.test_bzr.BzrClientAffectedFilesTest) ... ERROR [vcstools] Can't remove /tmp/tmpQDcfjd/local[/vcstools] ok Created a standalone tree (format: 2a) adding fixed.txt -Committing to: /tmp/tmp0331vp/remote/ +Committing to: /tmp/tmphH_0gZ/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmp0331vp/remote/ +Committing to: /tmp/tmphH_0gZ/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmp0331vp/remote/ +Committing to: /tmp/tmphH_0gZ/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/tmp0331vp/local[/vcstools] +test_get_log_defaults (test.test_bzr.BzrClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmphH_0gZ/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/tmpIQK13P/remote/ +Committing to: /tmp/tmpOfr1K3/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmpIQK13P/remote/ +Committing to: /tmp/tmpOfr1K3/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpIQK13P/remote/ +Committing to: /tmp/tmpOfr1K3/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/tmpIQK13P/local[/vcstools] +test_checkout_dir_exists (test.test_bzr.BzrClientTest) ... ERROR [vcstools] Can't remove /tmp/tmpOfr1K3/local[/vcstools] ok -makes sure failed checkout results in False, not Exception ... WARNING [vcstools] Command failed: 'bzr branch /tmp/tmpIQK13P/remotefoobar /tmp/tmpIQK13P/local' +makes sure failed checkout results in False, not Exception ... WARNING [vcstools] Command failed: 'bzr branch /tmp/tmpOfr1K3/remotefoobar /tmp/tmpOfr1K3/local' errcode: 3: -bzr: ERROR: Not a branch: "/tmp/tmpIQK13P/remotefoobar/". +bzr: ERROR: Not a branch: "/tmp/tmpOfr1K3/remotefoobar/". [/vcstools] -ERROR [vcstools] Command failed: 'bzr branch /tmp/tmpIQK13P/remotefoobar /tmp/tmpIQK13P/local' +ERROR [vcstools] Command failed: 'bzr branch /tmp/tmpOfr1K3/remotefoobar /tmp/tmpOfr1K3/local' errcode: 3: -bzr: ERROR: Not a branch: "/tmp/tmpIQK13P/remotefoobar/". +bzr: ERROR: Not a branch: "/tmp/tmpOfr1K3/remotefoobar/". [/vcstools] ok makes sure no exception happens on invalid update ... WARNING [vcstools] Command failed: 'bzr update -r foobar' - run at: '/tmp/tmpIQK13P/local' + run at: '/tmp/tmpOfr1K3/local' errcode: 3: -bzr: ERROR: Requested revision: 'foobar' does not exist in branch: file:///tmp/tmpIQK13P/local/ +bzr: ERROR: Requested revision: 'foobar' does not exist in branch: file:///tmp/tmpOfr1K3/local/ [/vcstools] ok test_checkout_specific_version_and_update (test.test_bzr.BzrClientTest) ... ok @@ -974,71 +1008,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/tmpNZ5IpJ/remote/ +Committing to: /tmp/tmpvc1d2V/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmpNZ5IpJ/remote/ +Committing to: /tmp/tmpvc1d2V/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpNZ5IpJ/remote/ +Committing to: /tmp/tmpvc1d2V/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/tmp7o6bxC/remote/.git/ -[master (root-commit) ef1bdc0] initial +Initialized empty Git repository in /tmp/tmpSYYN68/remote/.git/ +[master (root-commit) 69134ec] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master fbedb09] initial +[master e7e026c] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 3372467] modified +[master be3acc7] 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/tmp7o6bxC/ros'... +test_get_affected_files (test.test_git.GitClientAffectedFiles) ... Cloning into '/tmp/tmpSYYN68/ros'... done. Switched to a new branch 'localbranch' -[localbranch d2c74dc] local_file +[localbranch 8c006d9] local_file Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_file ok -Initialized empty Git repository in /tmp/tmpKbz8ns/remote/.git/ -[master (root-commit) 6a321bf] initial +Initialized empty Git repository in /tmp/tmpZxAjEm/remote/.git/ +[master (root-commit) 1643ca1] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 4129a14] initial +[master d8879d9] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 1112736] modified +[master f5fea3d] 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/tmpKbz8ns/ros'... +test_checkout_untracked_branch_and_update (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpZxAjEm/ros'... done. Switched to a new branch 'localbranch' -[localbranch a1b1824] my_branch +[localbranch 6cecb06] 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 2e1e603] diverged_branch +[diverged_branch 5dad23d] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -1053,48 +1087,48 @@ git checkout -b -HEAD is now at 6a321bf initial -[detached HEAD 5542a31] no_branch +HEAD is now at 1643ca1 initial +[detached HEAD b3b9a1e] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD eaf7afe] dangling +[detached HEAD c18b961] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 3352bae] dangling_tip +[detached HEAD f923e74] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 3352bae). +Deleted branch oldbranch (was f923e74). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 3352bae dangling_tip - eaf7afe dangling + f923e74 dangling_tip + c18b961 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 3352bae + git branch f923e74 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/tmpKbz8ns/ros'.[/vcstools] +Repository path is '/tmp/tmpZxAjEm/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/tmpKbz8ns/ros'... +test_detached_to_branch (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpZxAjEm/ros'... done. Switched to a new branch 'localbranch' -[localbranch 1118560] my_branch +[localbranch 8416c88] 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 62d7514] diverged_branch +[diverged_branch 9970190] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -1109,43 +1143,43 @@ git checkout -b -HEAD is now at 6a321bf initial -[detached HEAD 09d0e91] no_branch +HEAD is now at 1643ca1 initial +[detached HEAD c51c52d] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD ee6ac71] dangling +[detached HEAD c78f77f] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 8f2d82e] dangling_tip +[detached HEAD 6bdae5a] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 8f2d82e). +Deleted branch oldbranch (was 6bdae5a). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 8f2d82e dangling_tip - ee6ac71 dangling + 6bdae5a dangling_tip + c78f77f dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 8f2d82e + git branch 6bdae5a Switched to branch 'master' Your branch is up to date with 'origin/master'. ok -test_inject_protection (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpKbz8ns/ros'... +test_inject_protection (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpZxAjEm/ros'... done. Switched to a new branch 'localbranch' -[localbranch 7e3c03c] my_branch +[localbranch ec2a9a5] 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 cdff243] diverged_branch +[diverged_branch 4f1d738] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -1160,43 +1194,43 @@ git checkout -b -HEAD is now at 6a321bf initial -[detached HEAD e4ce173] no_branch +HEAD is now at 1643ca1 initial +[detached HEAD cabf2f0] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD 27c53c3] dangling +[detached HEAD fbedccc] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 0dfc9cb] dangling_tip +[detached HEAD 8c21971] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 0dfc9cb). +Deleted branch oldbranch (was 8c21971). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 0dfc9cb dangling_tip - 27c53c3 dangling + 8c21971 dangling_tip + fbedccc dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 0dfc9cb + git branch 8c21971 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/tmpKbz8ns/ros'... +test_is_commit_in_orphaned_subtree (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpZxAjEm/ros'... done. Switched to a new branch 'localbranch' -[localbranch a35c077] my_branch +[localbranch a7d3e22] 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 be8cfc2] diverged_branch +[diverged_branch a286e6c] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -1211,43 +1245,43 @@ git checkout -b -HEAD is now at 6a321bf initial -[detached HEAD 671a89f] no_branch +HEAD is now at 1643ca1 initial +[detached HEAD 48e3566] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD 8a6a2a1] dangling +[detached HEAD 6ea0b14] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 5a22bbf] dangling_tip +[detached HEAD 59ae9f3] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 5a22bbf). +Deleted branch oldbranch (was 59ae9f3). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 5a22bbf dangling_tip - 8a6a2a1 dangling + 59ae9f3 dangling_tip + 6ea0b14 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 5a22bbf + git branch 59ae9f3 Switched to branch 'master' Your branch is up to date with 'origin/master'. ok -test_protect_dangling (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpKbz8ns/ros'... +test_protect_dangling (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpZxAjEm/ros'... done. Switched to a new branch 'localbranch' -[localbranch a3c0567] my_branch +[localbranch 6090d63] 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 3ea7916] diverged_branch +[diverged_branch 8d53332] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -1262,198 +1296,198 @@ git checkout -b -HEAD is now at 6a321bf initial -[detached HEAD 50bc7fa] no_branch +HEAD is now at 1643ca1 initial +[detached HEAD f818599] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD afe8ee8] dangling +[detached HEAD dca20f9] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD ffe23b0] dangling_tip +[detached HEAD 6be1c6e] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was ffe23b0). +Deleted branch oldbranch (was 6be1c6e). Warning: you are leaving 2 commits behind, not connected to any of your branches: - ffe23b0 dangling_tip - afe8ee8 dangling + 6be1c6e dangling_tip + dca20f9 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch ffe23b0 + git branch 6be1c6e 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/tmpFfWMbt/remote/.git/ -[master (root-commit) da73e4e] initial +Initialized empty Git repository in /tmp/tmp9HOZjb/remote/.git/ +[master (root-commit) eda17f2] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master a77aeba] initial +[master 01d22b9] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master da099ef] modified +[master b949e93] 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/tmpFfWMbt/ros'... +test_get_log_defaults (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmp9HOZjb/ros'... done. Switched to a new branch 'localbranch' -[localbranch cfdf3b4] local_0 +[localbranch 2fc5ff7] local_0 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_0.txt -[localbranch 1f8345f] local_1 +[localbranch 7cc89d6] local_1 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_1.txt -[localbranch 8825ca4] local_2 +[localbranch 64b970b] local_2 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_2.txt -[localbranch 4613f6f] local_3 +[localbranch 7fb98ca] local_3 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_3.txt -[localbranch 2a5f88c] local_4 +[localbranch bd1fa15] local_4 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_4.txt -[localbranch c7b62e1] local_5 +[localbranch f70c6bd] local_5 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_5.txt -[localbranch 709ec7e] local_6 +[localbranch 7bbd5a2] local_6 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_6.txt -[localbranch 79fe461] local_7 +[localbranch 3145347] local_7 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_7.txt -[localbranch 974a00a] local_8 +[localbranch 5db4980] local_8 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_8.txt -[localbranch 1e187a8] local_9 +[localbranch c0cddc3] 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/tmpFfWMbt/ros'... +test_get_log_limit (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmp9HOZjb/ros'... done. Switched to a new branch 'localbranch' -[localbranch 7ad0215] local_0 +[localbranch eb8eba3] local_0 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_0.txt -[localbranch 49b8f7c] local_1 +[localbranch 5fa319e] local_1 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_1.txt -[localbranch 4ae5da8] local_2 +[localbranch 5440a66] local_2 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_2.txt -[localbranch 3bf70a6] local_3 +[localbranch 10a8765] local_3 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_3.txt -[localbranch cb5db8e] local_4 +[localbranch 9251e95] local_4 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_4.txt -[localbranch 8149632] local_5 +[localbranch 9f77283] local_5 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_5.txt -[localbranch 537fc11] local_6 +[localbranch b1d0b48] local_6 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_6.txt -[localbranch b406c03] local_7 +[localbranch 861e19d] local_7 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_7.txt -[localbranch 54d81c5] local_8 +[localbranch e13f179] local_8 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_8.txt -[localbranch acb0029] local_9 +[localbranch 27dcf01] 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/tmpFfWMbt/ros'... +test_get_log_path (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmp9HOZjb/ros'... done. Switched to a new branch 'localbranch' -[localbranch bfa4d85] local_0 +[localbranch eb8eba3] local_0 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_0.txt -[localbranch 3269841] local_1 +[localbranch 5fa319e] local_1 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_1.txt -[localbranch 04aa95d] local_2 +[localbranch 9bc452b] local_2 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_2.txt -[localbranch 9e03c94] local_3 +[localbranch 37f5433] local_3 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_3.txt -[localbranch b384637] local_4 +[localbranch f7549d3] local_4 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_4.txt -[localbranch 653ca5b] local_5 +[localbranch d13ee9d] local_5 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_5.txt -[localbranch 3cf7175] local_6 +[localbranch 14163af] local_6 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_6.txt -[localbranch e3a7fa4] local_7 +[localbranch 9fbb99e] local_7 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_7.txt -[localbranch e8f959a] local_8 +[localbranch aa53964] local_8 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_8.txt -[localbranch 0f2dbba] local_9 +[localbranch 3973a7a] 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/tmp2u20BU/remote/.git/ -[master (root-commit) a7787cb] initial +Initialized empty Git repository in /tmp/tmpunGpKg/remote/.git/ +[master (root-commit) a78c3e9] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 3a6b838] initial +[master 090b1e5] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 8001aae] modified +[master 8190b0f] 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/tmp2u20BU/ros'... +test_orphaned_overflow (test.test_git.GitClientOverflowTest) ... Cloning into '/tmp/tmpunGpKg/ros'... done. Note: checking out 'test_tag'. @@ -1466,145 +1500,145 @@ git checkout -b -HEAD is now at a7787cb initial -[detached HEAD 9e01fa1] modified-0 +HEAD is now at a78c3e9 initial +[detached HEAD 90e0138] modified-0 Author: Your Name 1 file changed, 1 insertion(+) create mode 100644 count.txt ok -Initialized empty Git repository in /tmp/tmpVCK9Rv/remote/.git/ -[master (root-commit) e5f4fc6] initial +Initialized empty Git repository in /tmp/tmpEsiZBm/remote/.git/ +[master (root-commit) 3668e29] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 7aa3c7e] initial +[master 729e53e] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master f000cd8] modified +[master e3e972b] 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/tmpVCK9Rv/ros'... +test_update_fetch_all_tags (test.test_git.GitClientRemoteVersionFetchTest) ... Cloning into '/tmp/tmpEsiZBm/ros'... done. -[master 5046ee4] newfile +[master 4b6a9c0] newfile Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 new_file.txt -From /tmp/tmpVCK9Rv/remote - f000cd8..5046ee4 master -> origin/master +From /tmp/tmpEsiZBm/remote + e3e972b..4b6a9c0 master -> origin/master ok -Initialized empty Git repository in /tmp/tmpluR7UX/remote/.git/ -[master (root-commit) cf21ff4] initial +Initialized empty Git repository in /tmp/tmpdbBiP0/remote/.git/ +[master (root-commit) 66960ee] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 0a4b93c] initial +[master 74d3b69] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master c026731] modified +[master fdc7e79] 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/tmpluR7UX/ros'... +test_checkout (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. ok -test_checkout_dir_exists (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_checkout_dir_exists (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. -fatal: destination path '/tmp/tmpluR7UX/ros' already exists and is not an empty directory. +fatal: destination path '/tmp/tmpdbBiP0/ros' already exists and is not an empty directory. ok -test_checkout_local_only_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_checkout_local_only_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. -HEAD is now at 0a4b93c initial +HEAD is now at 74d3b69 initial Switched to a new branch 'new_local_branch' ok -test_checkout_master_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_checkout_master_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. ok -test_checkout_no_unnecessary_updates (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_checkout_no_unnecessary_updates (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. ok -test_checkout_no_unnecessary_updates_other_branch (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_checkout_no_unnecessary_updates_other_branch (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. ok -test_checkout_shallow (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_checkout_shallow (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... ok -test_checkout_specific_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_checkout_specific_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. ok -test_checkout_specific_tag_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_checkout_specific_tag_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. ok -test_checkout_specific_version_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_checkout_specific_version_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. ok -test_fast_forward (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_fast_forward (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. -HEAD is now at cf21ff4 initial +HEAD is now at 66960ee initial ok -test_fast_forward_diverged (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_fast_forward_diverged (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. -HEAD is now at cf21ff4 initial -[master 118689b] diverge +HEAD is now at 66960ee initial +[master 11122a0] 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/tmpluR7UX/ros'... +test_fast_forward_simple_ref (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. -HEAD is now at cf21ff4 initial +HEAD is now at 66960ee initial ok -test_get_branch_parent (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_get_branch_parent (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. -From /tmp/tmpluR7UX/remote +From /tmp/tmpdbBiP0/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/tmpluR7UX/ros'... +test_get_current_version_label (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. -From /tmp/tmpluR7UX/remote +From /tmp/tmpdbBiP0/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/tmpluR7UX/ros'... +test_get_remote_version (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. -HEAD is now at cf21ff4 initial -From /tmp/tmpluR7UX/remote +HEAD is now at 66960ee initial +From /tmp/tmpdbBiP0/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/tmpluR7UX/ros'... +test_get_url_by_reading (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. ok test_get_url_nonexistant (test.test_git.GitClientTest) ... ok -test_get_version_not_exist (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpluR7UX/ros'... +test_get_version_not_exist (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpdbBiP0/ros'... done. ok -Initialized empty Git repository in /tmp/tmpIiyI5A/remote/.git/ -[master (root-commit) 81583c6] initial +Initialized empty Git repository in /tmp/tmpZhH6xs/remote/.git/ +[master (root-commit) 2ab4d73] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 40942d2] initial +[master bdfb6df] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 7672bbe] modified +[master 8bef5be] 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/tmpIiyI5A/ros'... +test_update_fetch_all_tags (test.test_git.GitClientUpdateTest) ... Cloning into '/tmp/tmpZhH6xs/ros'... done. Note: checking out 'test_tag'. @@ -1617,47 +1651,47 @@ git checkout -b -HEAD is now at 81583c6 initial -[detached HEAD 06beb6f] altfile +HEAD is now at 2ab4d73 initial +[detached HEAD b5df92d] 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: - 06beb6f altfile + b5df92d altfile If you want to keep it by creating a new branch, this may be a good time to do so with: - git branch 06beb6f + git branch b5df92d -HEAD is now at 81583c6 initial -[detached HEAD 2272da0] newfile +HEAD is now at 2ab4d73 initial +[detached HEAD 5bc6524] newfile Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 new_file.txt -From /tmp/tmpIiyI5A/remote +From /tmp/tmpZhH6xs/remote * [new branch] alt_branch -> origin/alt_branch -From /tmp/tmpIiyI5A/remote +From /tmp/tmpZhH6xs/remote * [new tag] new_tag -> new_tag ok -Initialized empty Git repository in /tmp/tmpw04U8b/remote/.git/ -[master (root-commit) 059edd8] initial +Initialized empty Git repository in /tmp/tmpU50DyA/remote/.git/ +[master (root-commit) d266a38] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 239a5e9] initial +[master 69c5905] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 5803553] modified +[master a8c3814] 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/tmpw04U8b/ros'... +Cloning into '/tmp/tmpU50DyA/ros'... done. rm 'deleted.txt' testDiff (test.test_git.GitDiffStatClientTest) ... ok @@ -1665,149 +1699,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/tmpdwNPsV/remote/.git/ -[master (root-commit) 240d7c3] initial +Initialized empty Git repository in /tmp/tmp1WqT_L/remote/.git/ +[master (root-commit) 090f479] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master c6a4a63] initial +[master a617e49] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 7a42fc8] modified +[master e148d50] 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/tmpdwNPsV/ros'... +Cloning into '/tmp/tmp1WqT_L/ros'... done. -testExportRepository (test.test_git.GitExportClientTest) ... Cloning into '/tmp/tmp7KVfwl'... +testExportRepository (test.test_git.GitExportClientTest) ... Cloning into '/tmp/tmpVWv1AY'... warning: --depth is ignored in local clones; use file:// instead. done. ok -Initialized empty Git repository in /tmp/tmpjSxMQl/remote/.git/ -[master (root-commit) ebaabc6] initial +Initialized empty Git repository in /tmp/tmpKuPbSL/remote/.git/ +[master (root-commit) a3b33c5] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master b2ba959] initial +[master 39d7d47] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 0261091] modified +[master f5b0305] 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/tmpjSxMQl/ros'... +testGetBranches (test.test_git.GitGetBranchesClientTest) ... Cloning into '/tmp/tmpKuPbSL/ros'... done. ok -Initialized empty Git repository in /tmp/tmpHzyb9p/remote/.git/ -[master (root-commit) 0d58c09] initial +Initialized empty Git repository in /tmp/tmpRgSRXu/remote/.git/ +[master (root-commit) 9d641b2] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 4ffad28] initial +[master 1d58775] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master cc26291] modified +[master 7d7f997] 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/tmpHzyb9p/ros'... +test_get_default_remote_version_label (test.test_git.GitSwitchDefaultBranchTest) ... Cloning into '/tmp/tmpRgSRXu/ros'... done. ok -test_checkout_timeout (test.test_git.GitTimeoutTest) ... Cloning into '/tmp/tmpNQy2k6/ros'... +test_checkout_timeout (test.test_git.GitTimeoutTest) ... Cloning into '/tmp/tmp4LRjCZ/ros'... error: cannot run ssh: No such file or directory fatal: unable to fork ok -Initialized empty Git repository in /tmp/tmp9ks7jh/remote/.git/ -[master (root-commit) 408faea] initial +Initialized empty Git repository in /tmp/tmpgVXBqk/remote/.git/ +[master (root-commit) 0cd4610] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -Initialized empty Git repository in /tmp/tmp9ks7jh/submodule/.git/ -[master (root-commit) 4412dfd] initial +Initialized empty Git repository in /tmp/tmpgVXBqk/submodule/.git/ +[master (root-commit) 5657c3b] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 subfixed.txt -Initialized empty Git repository in /tmp/tmp9ks7jh/subsubmodule/.git/ -[master (root-commit) b18a6bf] initial +Initialized empty Git repository in /tmp/tmpgVXBqk/subsubmodule/.git/ +[master (root-commit) e322d09] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 subsubfixed.txt -Cloning into '/tmp/tmp9ks7jh/submodule/subsubmodule'... +Cloning into '/tmp/tmpgVXBqk/submodule/subsubmodule'... done. -[master 9428e1b] subsubmodule +[master db7e056] 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/tmp9ks7jh/remote/submodule2'... +Cloning into '/tmp/tmpgVXBqk/remote/submodule2'... done. -[test_branch 2a19c1c] submodule +[test_branch 4ff6ac1] 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/tmp9ks7jh/remote/submodule'... +Cloning into '/tmp/tmpgVXBqk/remote/submodule'... done. -[master 78b176c] submodule +[master 7d9c6cf] 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/tmp9ks7jh/local'... +test_checkout_branch_without_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpgVXBqk/local'... done. ok -test_checkout_master_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp9ks7jh/local'... +test_checkout_master_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpgVXBqk/local'... done. -Submodule 'submodule' (/tmp/tmp9ks7jh/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp9ks7jh/local/submodule'... +Submodule 'submodule' (/tmp/tmpgVXBqk/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpgVXBqk/local/submodule'... done. -Submodule path 'submodule': checked out '9428e1b3d0920574e593a5ddc24f5f832a95d244' -Submodule 'subsubmodule' (/tmp/tmp9ks7jh/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp9ks7jh/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out 'db7e05669644b1ac931f74faa6ef90abf14c036f' +Submodule 'subsubmodule' (/tmp/tmpgVXBqk/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpgVXBqk/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'b18a6bf63129aa2b5fe7aa85c01d7f13189ce980' +Submodule path 'submodule/subsubmodule': checked out 'e322d09b7b6c9bc1d2b6dabaf64bace90e22f31b' ok -test_checkout_master_with_subs2 (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp9ks7jh/local'... +test_checkout_master_with_subs2 (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpgVXBqk/local'... done. ok -test_checkout_test_branch_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp9ks7jh/local'... +test_checkout_test_branch_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpgVXBqk/local'... done. ok -test_diff (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp9ks7jh/local'... +test_diff (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpgVXBqk/local'... done. -Submodule 'submodule' (/tmp/tmp9ks7jh/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp9ks7jh/local/submodule'... +Submodule 'submodule' (/tmp/tmpgVXBqk/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpgVXBqk/local/submodule'... done. -Submodule path 'submodule': checked out '9428e1b3d0920574e593a5ddc24f5f832a95d244' -Submodule 'subsubmodule' (/tmp/tmp9ks7jh/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp9ks7jh/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out 'db7e05669644b1ac931f74faa6ef90abf14c036f' +Submodule 'subsubmodule' (/tmp/tmpgVXBqk/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpgVXBqk/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'b18a6bf63129aa2b5fe7aa85c01d7f13189ce980' +Submodule path 'submodule/subsubmodule': checked out 'e322d09b7b6c9bc1d2b6dabaf64bace90e22f31b' ok -test_export_branch (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp9ks7jh/local'... +test_export_branch (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpgVXBqk/local'... done. -Cloning into '/tmp/tmpZF7ecf'... +Cloning into '/tmp/tmpoyzNrz'... warning: --depth is ignored in local clones; use file:// instead. done. ok -test_export_hash (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp9ks7jh/local'... +test_export_hash (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpgVXBqk/local'... done. -Cloning into '/tmp/tmp14okWN'... +Cloning into '/tmp/tmpQvSr_8'... warning: --depth is ignored in local clones; use file:// instead. done. -Note: checking out '2a19c1c462b18e2a2f88f4658349c25d31bf2222'. +Note: checking out '4ff6ac1577221b00fd1987a70425ba326546480b'. 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,149 +1853,149 @@ git checkout -b ok -test_export_master (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp9ks7jh/local'... +test_export_master (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpgVXBqk/local'... done. -Submodule 'submodule' (/tmp/tmp9ks7jh/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp9ks7jh/local/submodule'... +Submodule 'submodule' (/tmp/tmpgVXBqk/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpgVXBqk/local/submodule'... done. -Submodule path 'submodule': checked out '9428e1b3d0920574e593a5ddc24f5f832a95d244' -Submodule 'subsubmodule' (/tmp/tmp9ks7jh/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp9ks7jh/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out 'db7e05669644b1ac931f74faa6ef90abf14c036f' +Submodule 'subsubmodule' (/tmp/tmpgVXBqk/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpgVXBqk/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'b18a6bf63129aa2b5fe7aa85c01d7f13189ce980' -Cloning into '/tmp/tmpxTEfHK'... +Submodule path 'submodule/subsubmodule': checked out 'e322d09b7b6c9bc1d2b6dabaf64bace90e22f31b' +Cloning into '/tmp/tmpVTsp3i'... warning: --depth is ignored in local clones; use file:// instead. done. ok -test_status (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp9ks7jh/local'... +test_status (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpgVXBqk/local'... done. -Submodule 'submodule' (/tmp/tmp9ks7jh/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp9ks7jh/local/submodule'... +Submodule 'submodule' (/tmp/tmpgVXBqk/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpgVXBqk/local/submodule'... done. -Submodule path 'submodule': checked out '9428e1b3d0920574e593a5ddc24f5f832a95d244' -Submodule 'subsubmodule' (/tmp/tmp9ks7jh/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp9ks7jh/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out 'db7e05669644b1ac931f74faa6ef90abf14c036f' +Submodule 'subsubmodule' (/tmp/tmpgVXBqk/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpgVXBqk/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'b18a6bf63129aa2b5fe7aa85c01d7f13189ce980' +Submodule path 'submodule/subsubmodule': checked out 'e322d09b7b6c9bc1d2b6dabaf64bace90e22f31b' ok -test_switch_branches (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp9ks7jh/local'... +test_switch_branches (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpgVXBqk/local'... done. -Submodule 'submodule' (/tmp/tmp9ks7jh/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp9ks7jh/local/submodule'... +Submodule 'submodule' (/tmp/tmpgVXBqk/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpgVXBqk/local/submodule'... done. -Submodule path 'submodule': checked out '9428e1b3d0920574e593a5ddc24f5f832a95d244' -Submodule 'subsubmodule' (/tmp/tmp9ks7jh/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp9ks7jh/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out 'db7e05669644b1ac931f74faa6ef90abf14c036f' +Submodule 'subsubmodule' (/tmp/tmpgVXBqk/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpgVXBqk/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'b18a6bf63129aa2b5fe7aa85c01d7f13189ce980' +Submodule path 'submodule/subsubmodule': checked out 'e322d09b7b6c9bc1d2b6dabaf64bace90e22f31b' ok -test_switch_branches_retrieve_local_subcommit (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmp9ks7jh/local'... +test_switch_branches_retrieve_local_subcommit (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpgVXBqk/local'... done. -Submodule 'submodule' (/tmp/tmp9ks7jh/submodule) registered for path 'submodule' -Cloning into '/tmp/tmp9ks7jh/local/submodule'... +Submodule 'submodule' (/tmp/tmpgVXBqk/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpgVXBqk/local/submodule'... done. -Submodule path 'submodule': checked out '9428e1b3d0920574e593a5ddc24f5f832a95d244' -Submodule 'subsubmodule' (/tmp/tmp9ks7jh/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmp9ks7jh/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out 'db7e05669644b1ac931f74faa6ef90abf14c036f' +Submodule 'subsubmodule' (/tmp/tmpgVXBqk/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpgVXBqk/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out 'b18a6bf63129aa2b5fe7aa85c01d7f13189ce980' -[detached HEAD e42f774] submodif +Submodule path 'submodule/subsubmodule': checked out 'e322d09b7b6c9bc1d2b6dabaf64bace90e22f31b' +[detached HEAD 812d1ba] submodif Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 submodif.txt -[test_branch d9b2784] submodule2_modif +[test_branch 58195a1] submodule2_modif Author: Your Name 1 file changed, 1 insertion(+), 1 deletion(-) ok -marked working directory as branch test_branch +marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) -updating to branch default +sto aggiornando al 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/tmpB2vd2l/local' is not empty +test_get_log_defaults (test.test_hg.HGAffectedFilesTest) ... abortito: la destinazione '/tmp/tmpPekUJn/local' non ? vuota ok -marked working directory as branch test_branch +marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) -updating to branch default +sto aggiornando al 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/tmpSl1Cy_/local' is not empty +test_get_log_defaults (test.test_hg.HGClientLogTest) ... abortito: la destinazione '/tmp/tmpNyg5OC/local' non ? vuota ok -test_get_log_limit (test.test_hg.HGClientLogTest) ... updating to branch default +test_get_log_limit (test.test_hg.HGClientLogTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_get_log_path (test.test_hg.HGClientLogTest) ... updating to branch default +test_get_log_path (test.test_hg.HGClientLogTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -marked working directory as branch test_branch +marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) testDiffClean (test.test_hg.HGClientTest) ... ok testStatusClean (test.test_hg.HGClientTest) ... ok -test_checkout (test.test_hg.HGClientTest) ... updating to branch default +test_checkout (test.test_hg.HGClientTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_checkout_dir_exists (test.test_hg.HGClientTest) ... updating to branch default +test_checkout_dir_exists (test.test_hg.HGClientTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -abort: destination '/tmp/tmpIfIzoA/local' is not empty +abortito: la destinazione '/tmp/tmpdsHI4C/local' non ? vuota ok -test_checkout_emptystringversion (test.test_hg.HGClientTest) ... updating to branch default +test_checkout_emptystringversion (test.test_hg.HGClientTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_checkout_into_subdir_without_existing_parent (test.test_hg.HGClientTest) ... updating to branch default +test_checkout_into_subdir_without_existing_parent (test.test_hg.HGClientTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_checkout_specific_version_and_update (test.test_hg.HGClientTest) ... updating to branch default +test_checkout_specific_version_and_update (test.test_hg.HGClientTest) ... sto aggiornando al 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/tmpIfIzoA/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpdsHI4C/remote +sto cercando modifiche +nessuna modifica trovata 0 files updated, 0 files merged, 2 files removed, 0 files unresolved -pulling from /tmp/tmpIfIzoA/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpdsHI4C/remote +sto cercando modifiche +nessuna modifica trovata 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpIfIzoA/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpdsHI4C/remote +sto cercando modifiche +nessuna modifica trovata 0 files updated, 0 files merged, 2 files removed, 0 files unresolved -pulling from /tmp/tmpIfIzoA/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpdsHI4C/remote +sto cercando modifiche +nessuna modifica trovata 2 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_get_current_version_label (test.test_hg.HGClientTest) ... updating to branch default +test_get_current_version_label (test.test_hg.HGClientTest) ... sto aggiornando al 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/tmpIfIzoA/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpdsHI4C/remote +sto cercando modifiche +nessuna modifica trovata 5 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpIfIzoA/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpdsHI4C/remote +sto cercando modifiche +nessuna modifica trovata 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok test_get_environment_metadata (test.test_hg.HGClientTest) ... ok -test_get_remote_version (test.test_hg.HGClientTest) ... updating to branch default +test_get_remote_version (test.test_hg.HGClientTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -abort: destination '/tmp/tmpIfIzoA/local' is not empty -pulling from /tmp/tmpIfIzoA/remote -searching for changes -no changes found +abortito: la destinazione '/tmp/tmpdsHI4C/local' non ? vuota +sto facendo pull da /tmp/tmpdsHI4C/remote +sto cercando modifiche +nessuna modifica trovata 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpIfIzoA/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpdsHI4C/remote +sto cercando modifiche +nessuna modifica trovata 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok test_get_type_name (test.test_hg.HGClientTest) ... ok -test_get_url_by_reading (test.test_hg.HGClientTest) ... updating to branch default +test_get_url_by_reading (test.test_hg.HGClientTest) ... sto aggiornando al 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 ok test_get_url_nonexistant (test.test_hg.HGClientTest) ... ok -marked working directory as branch test_branch +marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) -updating to branch default +sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved testStatusUntracked (test.test_hg.HGDiffStatClientTest) ... ok test_diff (test.test_hg.HGDiffStatClientTest) ... ok @@ -1970,31 +2004,31 @@ test_hg_diff_path_change_None (test.test_hg.HGDiffStatClientTest) ... ok test_status (test.test_hg.HGDiffStatClientTest) ... ok test_status_relpath (test.test_hg.HGDiffStatClientTest) ... ok -marked working directory as branch test_branch +marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) -updating to branch default +sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved test_export_repository (test.test_hg.HGExportRepositoryClientTest) ... ok -marked working directory as branch test_branch +marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) -updating to branch default +sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -test_get_branches (test.test_hg.HGGetBranchesClientTest) ... pulling from /tmp/tmpAZSjyr/remote -searching for changes -no changes found -fixed.txt already tracked! -pulling from /tmp/tmpAZSjyr/remote -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 0 changes to 0 files -new changesets eea3c4a74ddb -(run 'hg update' to get a working copy) +test_get_branches (test.test_hg.HGGetBranchesClientTest) ... sto facendo pull da /tmp/tmpI6KX0t/remote +sto cercando modifiche +nessuna modifica trovata +fixed.txt ? gi? tracciato! +sto facendo pull da /tmp/tmpI6KX0t/remote +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 0 modifiche a 0 file +new changesets 3a0bd5748bed +(esegui 'hg update' per ottenere una copia funzionante) ok -marked working directory as branch test_branch +marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) -test_get_remote_version (test.test_hg.HGRemoteFetchTest) ... updating to branch default +test_get_remote_version (test.test_hg.HGRemoteFetchTest) ... sto aggiornando al 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 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -2032,13 +2066,13 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpcPd7Ky/local/deleted-fs.txt -A /tmp/tmpcPd7Ky/local/deleted.txt -A /tmp/tmpcPd7Ky/local/fixed.txt -A /tmp/tmpcPd7Ky/local/modified-fs.txt -A /tmp/tmpcPd7Ky/local/modified.txt +A /tmp/tmprg1qqh/local/deleted-fs.txt +A /tmp/tmprg1qqh/local/deleted.txt +A /tmp/tmprg1qqh/local/fixed.txt +A /tmp/tmprg1qqh/local/modified-fs.txt +A /tmp/tmprg1qqh/local/modified.txt Checked out revision 4. -test_get_affected_files (test.test_svn.SVNClientAffectedFiles) ... ERROR [vcstools] Can't remove /tmp/tmpcPd7Ky/local[/vcstools] +test_get_affected_files (test.test_svn.SVNClientAffectedFiles) ... ERROR [vcstools] Can't remove /tmp/tmprg1qqh/local[/vcstools] ok Checked out revision 0. A trunk @@ -2073,26 +2107,26 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmplsC8vQ/local/deleted-fs.txt -A /tmp/tmplsC8vQ/local/deleted.txt -A /tmp/tmplsC8vQ/local/fixed.txt -A /tmp/tmplsC8vQ/local/modified-fs.txt -A /tmp/tmplsC8vQ/local/modified.txt -Checked out revision 4. -test_get_log_defaults (test.test_svn.SvnClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmplsC8vQ/local[/vcstools] -ok -test_get_log_limit (test.test_svn.SvnClientLogTest) ... A /tmp/tmplsC8vQ/local/deleted-fs.txt -A /tmp/tmplsC8vQ/local/deleted.txt -A /tmp/tmplsC8vQ/local/fixed.txt -A /tmp/tmplsC8vQ/local/modified-fs.txt -A /tmp/tmplsC8vQ/local/modified.txt -Checked out revision 4. -ok -test_get_log_path (test.test_svn.SvnClientLogTest) ... A /tmp/tmplsC8vQ/local/deleted-fs.txt -A /tmp/tmplsC8vQ/local/deleted.txt -A /tmp/tmplsC8vQ/local/fixed.txt -A /tmp/tmplsC8vQ/local/modified-fs.txt -A /tmp/tmplsC8vQ/local/modified.txt +A /tmp/tmp4y69pi/local/deleted-fs.txt +A /tmp/tmp4y69pi/local/deleted.txt +A /tmp/tmp4y69pi/local/fixed.txt +A /tmp/tmp4y69pi/local/modified-fs.txt +A /tmp/tmp4y69pi/local/modified.txt +Checked out revision 4. +test_get_log_defaults (test.test_svn.SvnClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmp4y69pi/local[/vcstools] +ok +test_get_log_limit (test.test_svn.SvnClientLogTest) ... A /tmp/tmp4y69pi/local/deleted-fs.txt +A /tmp/tmp4y69pi/local/deleted.txt +A /tmp/tmp4y69pi/local/fixed.txt +A /tmp/tmp4y69pi/local/modified-fs.txt +A /tmp/tmp4y69pi/local/modified.txt +Checked out revision 4. +ok +test_get_log_path (test.test_svn.SvnClientLogTest) ... A /tmp/tmp4y69pi/local/deleted-fs.txt +A /tmp/tmp4y69pi/local/deleted.txt +A /tmp/tmp4y69pi/local/fixed.txt +A /tmp/tmp4y69pi/local/modified-fs.txt +A /tmp/tmp4y69pi/local/modified.txt Checked out revision 4. ok Checked out revision 0. @@ -2129,66 +2163,66 @@ Committing transaction... Committed revision 4. testDiffClean (test.test_svn.SvnClientTest) ... WARNING [vcstools] Command failed: 'svn diff "."' - run at: '/tmp/tmpvrGDE_/remote' + run at: '/tmp/tmpXygd6F/remote' errcode: 1: -svn: E155007: '/tmp/tmpvrGDE_/remote' is not a working copy +svn: E155007: '/tmp/tmpXygd6F/remote' is not a working copy [/vcstools] ok testStatusClean (test.test_svn.SvnClientTest) ... ok -test_checkout (test.test_svn.SvnClientTest) ... A /tmp/tmpvrGDE_/local/deleted-fs.txt -A /tmp/tmpvrGDE_/local/deleted.txt -A /tmp/tmpvrGDE_/local/fixed.txt -A /tmp/tmpvrGDE_/local/modified-fs.txt -A /tmp/tmpvrGDE_/local/modified.txt -Checked out revision 4. -ok -test_checkout_dir_exists (test.test_svn.SvnClientTest) ... A /tmp/tmpvrGDE_/local/deleted-fs.txt -A /tmp/tmpvrGDE_/local/deleted.txt -A /tmp/tmpvrGDE_/local/fixed.txt -A /tmp/tmpvrGDE_/local/modified-fs.txt -A /tmp/tmpvrGDE_/local/modified.txt -Checked out revision 4. -ERROR [vcstools] Can't remove /tmp/tmpvrGDE_/local[/vcstools] -ok -test_checkout_emptyversion (test.test_svn.SvnClientTest) ... A /tmp/tmpvrGDE_/local/deleted-fs.txt -A /tmp/tmpvrGDE_/local/deleted.txt -A /tmp/tmpvrGDE_/local/fixed.txt -A /tmp/tmpvrGDE_/local/modified-fs.txt -A /tmp/tmpvrGDE_/local/modified.txt +test_checkout (test.test_svn.SvnClientTest) ... A /tmp/tmpXygd6F/local/deleted-fs.txt +A /tmp/tmpXygd6F/local/deleted.txt +A /tmp/tmpXygd6F/local/fixed.txt +A /tmp/tmpXygd6F/local/modified-fs.txt +A /tmp/tmpXygd6F/local/modified.txt +Checked out revision 4. +ok +test_checkout_dir_exists (test.test_svn.SvnClientTest) ... A /tmp/tmpXygd6F/local/deleted-fs.txt +A /tmp/tmpXygd6F/local/deleted.txt +A /tmp/tmpXygd6F/local/fixed.txt +A /tmp/tmpXygd6F/local/modified-fs.txt +A /tmp/tmpXygd6F/local/modified.txt +Checked out revision 4. +ERROR [vcstools] Can't remove /tmp/tmpXygd6F/local[/vcstools] +ok +test_checkout_emptyversion (test.test_svn.SvnClientTest) ... A /tmp/tmpXygd6F/local/deleted-fs.txt +A /tmp/tmpXygd6F/local/deleted.txt +A /tmp/tmpXygd6F/local/fixed.txt +A /tmp/tmpXygd6F/local/modified-fs.txt +A /tmp/tmpXygd6F/local/modified.txt Checked out revision 4. -Updating '/tmp/tmpvrGDE_/local': +Updating '/tmp/tmpXygd6F/local': At revision 4. -Updating '/tmp/tmpvrGDE_/local': +Updating '/tmp/tmpXygd6F/local': At revision 4. ok -using just a number as version ... A /tmp/tmpvrGDE_/local/deleted-fs.txt -A /tmp/tmpvrGDE_/local/deleted.txt -A /tmp/tmpvrGDE_/local/fixed.txt -A /tmp/tmpvrGDE_/local/modified-fs.txt -A /tmp/tmpvrGDE_/local/modified.txt +using just a number as version ... A /tmp/tmpXygd6F/local/deleted-fs.txt +A /tmp/tmpXygd6F/local/deleted.txt +A /tmp/tmpXygd6F/local/fixed.txt +A /tmp/tmpXygd6F/local/modified-fs.txt +A /tmp/tmpXygd6F/local/modified.txt Checked out revision 3. -Updating '/tmp/tmpvrGDE_/local': -D /tmp/tmpvrGDE_/local/deleted.txt -D /tmp/tmpvrGDE_/local/deleted-fs.txt +Updating '/tmp/tmpXygd6F/local': +D /tmp/tmpXygd6F/local/deleted.txt +D /tmp/tmpXygd6F/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/tmpvrGDE_/local/modified.txt +test_get_remote_branch_version (test.test_svn.SvnClientTest) ... A /tmp/tmpXygd6F/local/modified.txt Checked out revision 4. ok -test_get_remote_version (test.test_svn.SvnClientTest) ... A /tmp/tmpvrGDE_/local/deleted-fs.txt -A /tmp/tmpvrGDE_/local/deleted.txt -A /tmp/tmpvrGDE_/local/fixed.txt -A /tmp/tmpvrGDE_/local/modified-fs.txt -A /tmp/tmpvrGDE_/local/modified.txt +test_get_remote_version (test.test_svn.SvnClientTest) ... A /tmp/tmpXygd6F/local/deleted-fs.txt +A /tmp/tmpXygd6F/local/deleted.txt +A /tmp/tmpXygd6F/local/fixed.txt +A /tmp/tmpXygd6F/local/modified-fs.txt +A /tmp/tmpXygd6F/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/tmpvrGDE_/local/deleted-fs.txt -A /tmp/tmpvrGDE_/local/deleted.txt -A /tmp/tmpvrGDE_/local/fixed.txt -A /tmp/tmpvrGDE_/local/modified-fs.txt -A /tmp/tmpvrGDE_/local/modified.txt +test_get_url_by_reading (test.test_svn.SvnClientTest) ... A /tmp/tmpXygd6F/local/deleted-fs.txt +A /tmp/tmpXygd6F/local/deleted.txt +A /tmp/tmpXygd6F/local/fixed.txt +A /tmp/tmpXygd6F/local/modified-fs.txt +A /tmp/tmpXygd6F/local/modified.txt Checked out revision 4. ok test_get_url_nonexistant (test.test_svn.SvnClientTest) ... ok @@ -2226,11 +2260,11 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpzFKtch/local/deleted-fs.txt -A /tmp/tmpzFKtch/local/deleted.txt -A /tmp/tmpzFKtch/local/fixed.txt -A /tmp/tmpzFKtch/local/modified-fs.txt -A /tmp/tmpzFKtch/local/modified.txt +A /tmp/tmpw383f8/local/deleted-fs.txt +A /tmp/tmpw383f8/local/deleted.txt +A /tmp/tmpw383f8/local/fixed.txt +A /tmp/tmpw383f8/local/modified-fs.txt +A /tmp/tmpw383f8/local/modified.txt Checked out revision 4. D deleted.txt A added.txt @@ -2272,11 +2306,11 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpYbYUOb/local/deleted-fs.txt -A /tmp/tmpYbYUOb/local/deleted.txt -A /tmp/tmpYbYUOb/local/fixed.txt -A /tmp/tmpYbYUOb/local/modified-fs.txt -A /tmp/tmpYbYUOb/local/modified.txt +A /tmp/tmpaOr7VU/local/deleted-fs.txt +A /tmp/tmpaOr7VU/local/deleted.txt +A /tmp/tmpaOr7VU/local/fixed.txt +A /tmp/tmpaOr7VU/local/modified-fs.txt +A /tmp/tmpaOr7VU/local/modified.txt Checked out revision 4. test_export_repository (test.test_svn.SvnExportRepositoryClientTest) ... ok Checked out revision 0. @@ -2312,11 +2346,11 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpI2zVMN/local/deleted-fs.txt -A /tmp/tmpI2zVMN/local/deleted.txt -A /tmp/tmpI2zVMN/local/fixed.txt -A /tmp/tmpI2zVMN/local/modified-fs.txt -A /tmp/tmpI2zVMN/local/modified.txt +A /tmp/tmpGggOuV/local/deleted-fs.txt +A /tmp/tmpGggOuV/local/deleted.txt +A /tmp/tmpGggOuV/local/fixed.txt +A /tmp/tmpGggOuV/local/modified-fs.txt +A /tmp/tmpGggOuV/local/modified.txt Checked out revision 4. test_get_branches (test.test_svn.SvnGetBranchesClientTest) ... A branches/foo2 A branches/bar @@ -2324,7 +2358,7 @@ Adding branches/foo2 Committing transaction... Committed revision 5. -A /tmp/tmpI2zVMN/local_foo/modified.txt +A /tmp/tmpGggOuV/local_foo/modified.txt Checked out revision 5. ok test_get_branches_non_canonical (test.test_svn.SvnGetBranchesClientTest) ... Checked out revision 0. @@ -2337,8 +2371,8 @@ Transmitting file data .done Committing transaction... Committed revision 1. -A /tmp/tmpI2zVMN/local_nc/foosub -A /tmp/tmpI2zVMN/local_nc/foosub/fixed.txt +A /tmp/tmpGggOuV/local_nc/foosub +A /tmp/tmpGggOuV/local_nc/foosub/fixed.txt Checked out revision 1. ok test_get_remote_contents (test.test_svn.SvnGetBranchesClientTest) ... ok @@ -2356,7 +2390,7 @@ test_register_vcs (test.test_vcs_abstraction.TestVcsAbstraction) ... ok ---------------------------------------------------------------------- -Ran 147 tests in 669.626s +Ran 147 tests in 355.927s 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 +2399,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 +2412,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/tmpvrijk90y/remote/ +Committing to: /tmp/tmpafmzc2n_/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmpvrijk90y/remote/ +Committing to: /tmp/tmpafmzc2n_/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpvrijk90y/remote/ +Committing to: /tmp/tmpafmzc2n_/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/tmpvrijk90y/local[/vcstools] +test_get_log_defaults (test.test_bzr.BzrClientAffectedFilesTest) ... ERROR [vcstools] Can't remove /tmp/tmpafmzc2n_/local[/vcstools] Created a standalone tree (format: 2a) adding fixed.txt -Committing to: /tmp/tmpk8gzgodp/remote/ +Committing to: /tmp/tmp4tjuvvnw/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmpk8gzgodp/remote/ +Committing to: /tmp/tmp4tjuvvnw/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpk8gzgodp/remote/ +Committing to: /tmp/tmp4tjuvvnw/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/tmpk8gzgodp/local[/vcstools] +test_get_log_defaults (test.test_bzr.BzrClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmp4tjuvvnw/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/tmpfdw9okvr/remote/ +Committing to: /tmp/tmpbr42wkzj/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmpfdw9okvr/remote/ +Committing to: /tmp/tmpbr42wkzj/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpfdw9okvr/remote/ +Committing to: /tmp/tmpbr42wkzj/remote/ added deleted-fs.txt added deleted.txt Committed revision 3. @@ -2440,21 +2474,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/tmpfdw9okvr/local[/vcstools] +test_checkout_dir_exists (test.test_bzr.BzrClientTest) ... ERROR [vcstools] Can't remove /tmp/tmpbr42wkzj/local[/vcstools] ok -makes sure failed checkout results in False, not Exception ... WARNING [vcstools] Command failed: 'bzr branch /tmp/tmpfdw9okvr/remotefoobar /tmp/tmpfdw9okvr/local' +makes sure failed checkout results in False, not Exception ... WARNING [vcstools] Command failed: 'bzr branch /tmp/tmpbr42wkzj/remotefoobar /tmp/tmpbr42wkzj/local' errcode: 3: -bzr: ERROR: Not a branch: "/tmp/tmpfdw9okvr/remotefoobar/". +bzr: ERROR: Not a branch: "/tmp/tmpbr42wkzj/remotefoobar/". [/vcstools] -ERROR [vcstools] Command failed: 'bzr branch /tmp/tmpfdw9okvr/remotefoobar /tmp/tmpfdw9okvr/local' +ERROR [vcstools] Command failed: 'bzr branch /tmp/tmpbr42wkzj/remotefoobar /tmp/tmpbr42wkzj/local' errcode: 3: -bzr: ERROR: Not a branch: "/tmp/tmpfdw9okvr/remotefoobar/". +bzr: ERROR: Not a branch: "/tmp/tmpbr42wkzj/remotefoobar/". [/vcstools] ok makes sure no exception happens on invalid update ... WARNING [vcstools] Command failed: 'bzr update -r foobar' - run at: '/tmp/tmpfdw9okvr/local' + run at: '/tmp/tmpbr42wkzj/local' errcode: 3: -bzr: ERROR: Requested revision: 'foobar' does not exist in branch: file:///tmp/tmpfdw9okvr/local/ +bzr: ERROR: Requested revision: 'foobar' does not exist in branch: file:///tmp/tmpbr42wkzj/local/ [/vcstools] ok test_checkout_specific_version_and_update (test.test_bzr.BzrClientTest) ... ok @@ -2466,72 +2500,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/tmpir21_jm1/remote/ +Committing to: /tmp/tmp_xi2avbg/remote/ added fixed.txt Committed revision 1. Created tag test_tag. adding modified.txt adding modified-fs.txt -Committing to: /tmp/tmpir21_jm1/remote/ +Committing to: /tmp/tmp_xi2avbg/remote/ added modified-fs.txt added modified.txt Committed revision 2. adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpir21_jm1/remote/ +Committing to: /tmp/tmp_xi2avbg/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/tmpiurmaxlw/remote/.git/ -[master (root-commit) 41d3c0e] initial +Test source code for PEP8 conformance ... Initialized empty Git repository in /tmp/tmphi7jc0ut/remote/.git/ +[master (root-commit) cfac9aa] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master f80a6fc] initial +[master ca1ee18] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master b13d411] modified +[master f32c2e0] 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/tmpiurmaxlw/ros'... +test_get_affected_files (test.test_git.GitClientAffectedFiles) ... Cloning into '/tmp/tmphi7jc0ut/ros'... done. Switched to a new branch 'localbranch' -[localbranch 2aacea1] local_file +[localbranch 3110188] local_file Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_file -Initialized empty Git repository in /tmp/tmppik2u8pu/remote/.git/ -[master (root-commit) 45c4538] initial +Initialized empty Git repository in /tmp/tmpn66oru_t/remote/.git/ +[master (root-commit) cfac9aa] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 4040345] initial +[master ca1ee18] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 601d2f3] modified +[master f32c2e0] 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/tmppik2u8pu/ros'... +test_checkout_untracked_branch_and_update (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpn66oru_t/ros'... done. Switched to a new branch 'localbranch' -[localbranch eb0e77d] my_branch +[localbranch a181df7] 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 87f7d28] diverged_branch +[diverged_branch 60c6c83] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -2546,48 +2580,48 @@ git checkout -b -HEAD is now at 45c4538 initial -[detached HEAD 579f47b] no_branch +HEAD is now at cfac9aa initial +[detached HEAD dc80bde] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD 3e2f0d6] dangling +[detached HEAD a966920] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 9a5565e] dangling_tip +[detached HEAD b128c13] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 9a5565e). +Deleted branch oldbranch (was b128c13). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 9a5565e dangling_tip - 3e2f0d6 dangling + b128c13 dangling_tip + a966920 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 9a5565e + git branch b128c13 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/tmppik2u8pu/ros'.[/vcstools] +Repository path is '/tmp/tmpn66oru_t/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/tmppik2u8pu/ros'... +test_detached_to_branch (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpn66oru_t/ros'... done. Switched to a new branch 'localbranch' -[localbranch cbb9847] my_branch +[localbranch 1e2b28c] 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 752de94] diverged_branch +[diverged_branch ad40106] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -2602,43 +2636,43 @@ git checkout -b -HEAD is now at 45c4538 initial -[detached HEAD eb9ea89] no_branch +HEAD is now at cfac9aa initial +[detached HEAD b5a9303] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD aa83b10] dangling +[detached HEAD f4678d1] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 2e5e5fc] dangling_tip +[detached HEAD 9290534] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 2e5e5fc). +Deleted branch oldbranch (was 9290534). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 2e5e5fc dangling_tip - aa83b10 dangling + 9290534 dangling_tip + f4678d1 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 2e5e5fc + git branch 9290534 Switched to branch 'master' Your branch is up to date with 'origin/master'. ok -test_inject_protection (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmppik2u8pu/ros'... +test_inject_protection (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpn66oru_t/ros'... done. Switched to a new branch 'localbranch' -[localbranch b85e227] my_branch +[localbranch 29d197e] 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 453723a] diverged_branch +[diverged_branch 6d2738c] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -2653,43 +2687,43 @@ git checkout -b -HEAD is now at 45c4538 initial -[detached HEAD 9dfc7ef] no_branch +HEAD is now at cfac9aa initial +[detached HEAD 8d3b7c0] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD 5543dea] dangling +[detached HEAD 08103c6] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 57b8dfe] dangling_tip +[detached HEAD 80c1be2] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 57b8dfe). +Deleted branch oldbranch (was 80c1be2). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 57b8dfe dangling_tip - 5543dea dangling + 80c1be2 dangling_tip + 08103c6 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 57b8dfe + git branch 80c1be2 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/tmppik2u8pu/ros'... +test_is_commit_in_orphaned_subtree (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpn66oru_t/ros'... done. Switched to a new branch 'localbranch' -[localbranch f4929bb] my_branch +[localbranch 4e7dff7] 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 e3ad617] diverged_branch +[diverged_branch 6d2738c] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -2704,43 +2738,43 @@ git checkout -b -HEAD is now at 45c4538 initial -[detached HEAD 2d612fe] no_branch +HEAD is now at cfac9aa initial +[detached HEAD 8d3b7c0] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD 2e06a29] dangling +[detached HEAD 08103c6] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 7217394] dangling_tip +[detached HEAD 80c1be2] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 7217394). +Deleted branch oldbranch (was 80c1be2). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 7217394 dangling_tip - 2e06a29 dangling + 80c1be2 dangling_tip + 08103c6 dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 7217394 + git branch 80c1be2 Switched to branch 'master' Your branch is up to date with 'origin/master'. ok -test_protect_dangling (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmppik2u8pu/ros'... +test_protect_dangling (test.test_git.GitClientDanglingCommitsTest) ... Cloning into '/tmp/tmpn66oru_t/ros'... done. Switched to a new branch 'localbranch' -[localbranch 4cd2a4b] my_branch +[localbranch c9b6571] 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 494cb18] diverged_branch +[diverged_branch 581249b] diverged_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 diverged.txt @@ -2755,198 +2789,198 @@ git checkout -b -HEAD is now at 45c4538 initial -[detached HEAD 99643cc] no_branch +HEAD is now at cfac9aa initial +[detached HEAD 5b4aedc] no_branch Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tagged.txt -[detached HEAD 3c73959] dangling +[detached HEAD 9044dee] dangling Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling.txt -[detached HEAD 0413951] dangling_tip +[detached HEAD 89529a8] dangling_tip Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dangling-tip.txt -Deleted branch oldbranch (was 0413951). +Deleted branch oldbranch (was 89529a8). Warning: you are leaving 2 commits behind, not connected to any of your branches: - 0413951 dangling_tip - 3c73959 dangling + 89529a8 dangling_tip + 9044dee dangling If you want to keep them by creating a new branch, this may be a good time to do so with: - git branch 0413951 + git branch 89529a8 Switched to branch 'master' Your branch is up to date with 'origin/master'. -Initialized empty Git repository in /tmp/tmp5gtuzfm9/remote/.git/ -[master (root-commit) 8bc1b34] initial +Initialized empty Git repository in /tmp/tmppzknmwr0/remote/.git/ +[master (root-commit) a71f9e8] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 5093b5a] initial +[master 2788e4c] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master f42ffb3] modified +[master 10fa8f8] 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/tmp5gtuzfm9/ros'... +test_get_log_defaults (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmppzknmwr0/ros'... done. Switched to a new branch 'localbranch' -[localbranch a6f39a4] local_0 +[localbranch 7bf896a] local_0 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_0.txt -[localbranch f492d67] local_1 +[localbranch 89bc9da] local_1 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_1.txt -[localbranch 5cc5bce] local_2 +[localbranch 0c9fa8b] local_2 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_2.txt -[localbranch 9aabbde] local_3 +[localbranch c523199] local_3 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_3.txt -[localbranch 11288b5] local_4 +[localbranch 5734217] local_4 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_4.txt -[localbranch 327a818] local_5 +[localbranch dd06fc9] local_5 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_5.txt -[localbranch 94e3087] local_6 +[localbranch e0fcbe1] local_6 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_6.txt -[localbranch 0917327] local_7 +[localbranch 510ca5a] local_7 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_7.txt -[localbranch 13302fe] local_8 +[localbranch c491cef] local_8 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_8.txt -[localbranch 048c7f1] local_9 +[localbranch 8bc348f] 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/tmp5gtuzfm9/ros'... +test_get_log_limit (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmppzknmwr0/ros'... done. Switched to a new branch 'localbranch' -[localbranch 30f3abf] local_0 +[localbranch 7bf896a] local_0 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_0.txt -[localbranch e257e33] local_1 +[localbranch 89bc9da] local_1 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_1.txt -[localbranch 6435d72] local_2 +[localbranch 9c598d7] local_2 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_2.txt -[localbranch d11c22d] local_3 +[localbranch 5954b85] local_3 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_3.txt -[localbranch 26b9203] local_4 +[localbranch b3a20f3] local_4 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_4.txt -[localbranch 2e9456e] local_5 +[localbranch cf55062] local_5 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_5.txt -[localbranch f02e744] local_6 +[localbranch 2264067] local_6 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_6.txt -[localbranch f1439b8] local_7 +[localbranch 9d8e543] local_7 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_7.txt -[localbranch 50b6c26] local_8 +[localbranch ca96f3a] local_8 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_8.txt -[localbranch 9b1aa9f] local_9 +[localbranch 5e87836] 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/tmp5gtuzfm9/ros'... +test_get_log_path (test.test_git.GitClientLogTest) ... Cloning into '/tmp/tmppzknmwr0/ros'... done. Switched to a new branch 'localbranch' -[localbranch 8864fd0] local_0 +[localbranch 47eb1cd] local_0 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_0.txt -[localbranch 4a7fe28] local_1 +[localbranch 4f9c0e4] local_1 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_1.txt -[localbranch e25f0e5] local_2 +[localbranch 1f57ccf] local_2 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_2.txt -[localbranch 86782c8] local_3 +[localbranch 6d8687b] local_3 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_3.txt -[localbranch 664a9b6] local_4 +[localbranch 09a83fd] local_4 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_4.txt -[localbranch b352c41] local_5 +[localbranch ead47b7] local_5 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_5.txt -[localbranch 6c097ee] local_6 +[localbranch ed758bf] local_6 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_6.txt -[localbranch 551a6ec] local_7 +[localbranch 99a50f3] local_7 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_7.txt -[localbranch 07f7e89] local_8 +[localbranch 26d07f5] local_8 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_8.txt -[localbranch b0c8a76] local_9 +[localbranch 23a60c9] local_9 Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 local_9.txt -Initialized empty Git repository in /tmp/tmpzvxy5ip0/remote/.git/ -[master (root-commit) aa8dddd] initial +Initialized empty Git repository in /tmp/tmpo3z0xhqn/remote/.git/ +[master (root-commit) 54e9598] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 491c67e] initial +[master 9516e8d] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 2111de2] modified +[master 7ff2096] 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/tmpzvxy5ip0/ros'... +test_orphaned_overflow (test.test_git.GitClientOverflowTest) ... Cloning into '/tmp/tmpo3z0xhqn/ros'... done. Note: checking out 'test_tag'. @@ -2959,46 +2993,46 @@ git checkout -b -HEAD is now at aa8dddd initial -[detached HEAD 39b08dd] modified-0 +HEAD is now at 54e9598 initial +[detached HEAD abfe432] modified-0 Author: Your Name 1 file changed, 1 insertion(+) create mode 100644 count.txt -Initialized empty Git repository in /tmp/tmp08mh_jgo/remote/.git/ -[master (root-commit) 997fd3a] initial +Initialized empty Git repository in /tmp/tmp4pzjatga/remote/.git/ +[master (root-commit) 849974b] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 4e0c4cf] initial +[master a6a8028] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 456224b] modified +[master 0b4fc4d] 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/tmp08mh_jgo/ros'... +test_update_fetch_all_tags (test.test_git.GitClientRemoteVersionFetchTest) ... Cloning into '/tmp/tmp4pzjatga/ros'... done. -[master a15bc8f] newfile +[master eef6bec] newfile Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 new_file.txt -From /tmp/tmp08mh_jgo/remote - 456224b..a15bc8f master -> origin/master -Initialized empty Git repository in /tmp/tmpt1m4elmj/remote/.git/ -[master (root-commit) 67cbe69] initial +From /tmp/tmp4pzjatga/remote + 0b4fc4d..eef6bec master -> origin/master +Initialized empty Git repository in /tmp/tmpuez58ali/remote/.git/ +[master (root-commit) 418ecb8] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 5c7cccc] initial +[master 1a3c428] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master dfae5aa] modified +[master 97781cb] modified Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt @@ -3006,98 +3040,98 @@ ok testDiffClean (test.test_git.GitClientTest) ... ok testStatusClean (test.test_git.GitClientTest) ... ok -test_checkout (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_checkout (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. ok -test_checkout_dir_exists (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_checkout_dir_exists (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. -fatal: destination path '/tmp/tmpt1m4elmj/ros' already exists and is not an empty directory. +fatal: destination path '/tmp/tmpuez58ali/ros' already exists and is not an empty directory. ok -test_checkout_local_only_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_checkout_local_only_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. -HEAD is now at 5c7cccc initial +HEAD is now at 1a3c428 initial Switched to a new branch 'new_local_branch' ok -test_checkout_master_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_checkout_master_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. ok -test_checkout_no_unnecessary_updates (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_checkout_no_unnecessary_updates (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. ok -test_checkout_no_unnecessary_updates_other_branch (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_checkout_no_unnecessary_updates_other_branch (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. ok -test_checkout_shallow (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_checkout_shallow (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... ok -test_checkout_specific_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_checkout_specific_branch_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. ok -test_checkout_specific_tag_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_checkout_specific_tag_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. ok -test_checkout_specific_version_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_checkout_specific_version_and_update (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. ok -test_fast_forward (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_fast_forward (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. -HEAD is now at 67cbe69 initial +HEAD is now at 418ecb8 initial ok -test_fast_forward_diverged (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_fast_forward_diverged (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. -HEAD is now at 67cbe69 initial -[master 27b3a6d] diverge +HEAD is now at 418ecb8 initial +[master d047fd6] 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/tmpt1m4elmj/ros'... +test_fast_forward_simple_ref (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. -HEAD is now at 67cbe69 initial +HEAD is now at 418ecb8 initial ok -test_get_branch_parent (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_get_branch_parent (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. -From /tmp/tmpt1m4elmj/remote +From /tmp/tmpuez58ali/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/tmpt1m4elmj/ros'... +test_get_current_version_label (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. -From /tmp/tmpt1m4elmj/remote +From /tmp/tmpuez58ali/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/tmpt1m4elmj/ros'... +test_get_remote_version (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. -HEAD is now at 67cbe69 initial -From /tmp/tmpt1m4elmj/remote +HEAD is now at 418ecb8 initial +From /tmp/tmpuez58ali/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/tmpt1m4elmj/ros'... +test_get_url_by_reading (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. ok test_get_url_nonexistant (test.test_git.GitClientTest) ... ok -test_get_version_not_exist (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpt1m4elmj/ros'... +test_get_version_not_exist (test.test_git.GitClientTest) ... Cloning into '/tmp/tmpuez58ali/ros'... done. -Initialized empty Git repository in /tmp/tmpv1m_lp8g/remote/.git/ -[master (root-commit) f4a5653] initial +Initialized empty Git repository in /tmp/tmpgkmebo63/remote/.git/ +[master (root-commit) bf01f06] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master addb914] initial +[master 3b50cae] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 2392d00] modified +[master 934fb37] 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/tmpv1m_lp8g/ros'... +test_update_fetch_all_tags (test.test_git.GitClientUpdateTest) ... Cloning into '/tmp/tmpgkmebo63/ros'... done. Note: checking out 'test_tag'. @@ -3110,46 +3144,46 @@ git checkout -b -HEAD is now at f4a5653 initial -[detached HEAD 06a44c1] altfile +HEAD is now at bf01f06 initial +[detached HEAD 7ef0bb3] 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: - 06a44c1 altfile + 7ef0bb3 altfile If you want to keep it by creating a new branch, this may be a good time to do so with: - git branch 06a44c1 + git branch 7ef0bb3 -HEAD is now at f4a5653 initial -[detached HEAD c584d99] newfile +HEAD is now at bf01f06 initial +[detached HEAD 6dfd6c8] newfile Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 new_file.txt -From /tmp/tmpv1m_lp8g/remote +From /tmp/tmpgkmebo63/remote * [new branch] alt_branch -> origin/alt_branch -From /tmp/tmpv1m_lp8g/remote +From /tmp/tmpgkmebo63/remote * [new tag] new_tag -> new_tag -Initialized empty Git repository in /tmp/tmp50ilaojj/remote/.git/ -[master (root-commit) c0839f4] initial +Initialized empty Git repository in /tmp/tmph3nb8c0e/remote/.git/ +[master (root-commit) 8501fd7] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master e74bafe] initial +[master f7c75c2] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 5613302] modified +[master 136f431] 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/tmp50ilaojj/ros'... +Cloning into '/tmp/tmph3nb8c0e/ros'... done. rm 'deleted.txt' ok @@ -3157,150 +3191,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/tmps6tmq3hq/remote/.git/ -[master (root-commit) 2acdfc0] initial +testStatusUntracked (test.test_git.GitDiffStatClientTest) ... Initialized empty Git repository in /tmp/tmp752qshvp/remote/.git/ +[master (root-commit) a33b85c] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 4e4a2cc] initial +[master c790b9e] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 2964a1c] modified +[master 03761c8] 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/tmps6tmq3hq/ros'... +Cloning into '/tmp/tmp752qshvp/ros'... done. ok -testExportRepository (test.test_git.GitExportClientTest) ... Cloning into '/tmp/tmpb4b8of_d'... +testExportRepository (test.test_git.GitExportClientTest) ... Cloning into '/tmp/tmpvi9yegrc'... warning: --depth is ignored in local clones; use file:// instead. done. -Initialized empty Git repository in /tmp/tmpaspxpvgf/remote/.git/ -[master (root-commit) 8784940] initial +Initialized empty Git repository in /tmp/tmpyjp0kffo/remote/.git/ +[master (root-commit) f60971b] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 648584c] initial +[master 04861de] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 0de513e] modified +[master 510093a] 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/tmpaspxpvgf/ros'... +testGetBranches (test.test_git.GitGetBranchesClientTest) ... Cloning into '/tmp/tmpyjp0kffo/ros'... done. -Initialized empty Git repository in /tmp/tmpnivpr4mb/remote/.git/ -[master (root-commit) a8cb0e8] initial +Initialized empty Git repository in /tmp/tmpn9c6ihqm/remote/.git/ +[master (root-commit) f60971b] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -[master 10523f4] initial +[master 04861de] initial Author: Your Name 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modified-fs.txt create mode 100644 modified.txt -[master 3e8d340] modified +[master 94f7d3b] 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/tmpnivpr4mb/ros'... +test_get_default_remote_version_label (test.test_git.GitSwitchDefaultBranchTest) ... Cloning into '/tmp/tmpn9c6ihqm/ros'... done. ok -test_checkout_timeout (test.test_git.GitTimeoutTest) ... Cloning into '/tmp/tmp0xdnlr9w/ros'... +test_checkout_timeout (test.test_git.GitTimeoutTest) ... Cloning into '/tmp/tmp3slnqnv0/ros'... error: cannot run ssh: No such file or directory fatal: unable to fork -Initialized empty Git repository in /tmp/tmprg1qo1qu/remote/.git/ -[master (root-commit) 4d742a0] initial +Initialized empty Git repository in /tmp/tmpxn7zi9z8/remote/.git/ +[master (root-commit) 43b4be8] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fixed.txt -Initialized empty Git repository in /tmp/tmprg1qo1qu/submodule/.git/ -[master (root-commit) 9e12d75] initial +Initialized empty Git repository in /tmp/tmpxn7zi9z8/submodule/.git/ +[master (root-commit) ae42f2d] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 subfixed.txt -Initialized empty Git repository in /tmp/tmprg1qo1qu/subsubmodule/.git/ -[master (root-commit) 6378c0d] initial +Initialized empty Git repository in /tmp/tmpxn7zi9z8/subsubmodule/.git/ +[master (root-commit) 65c75db] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 subsubfixed.txt -Cloning into '/tmp/tmprg1qo1qu/submodule/subsubmodule'... +Cloning into '/tmp/tmpxn7zi9z8/submodule/subsubmodule'... done. -[master ecb5163] subsubmodule +[master 85c6fe7] 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/tmprg1qo1qu/remote/submodule2'... +Cloning into '/tmp/tmpxn7zi9z8/remote/submodule2'... done. -[test_branch 71a054e] submodule +[test_branch 0661cf6] 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/tmprg1qo1qu/remote/submodule'... +Cloning into '/tmp/tmpxn7zi9z8/remote/submodule'... done. -[master ff66915] submodule +[master 085e5fc] 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/tmprg1qo1qu/local'... +test_checkout_branch_without_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpxn7zi9z8/local'... done. ok -test_checkout_master_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmprg1qo1qu/local'... +test_checkout_master_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpxn7zi9z8/local'... done. -Submodule 'submodule' (/tmp/tmprg1qo1qu/submodule) registered for path 'submodule' -Cloning into '/tmp/tmprg1qo1qu/local/submodule'... +Submodule 'submodule' (/tmp/tmpxn7zi9z8/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpxn7zi9z8/local/submodule'... done. -Submodule path 'submodule': checked out 'ecb516324ec59970b5a49e29f010d97a476072cc' -Submodule 'subsubmodule' (/tmp/tmprg1qo1qu/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmprg1qo1qu/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out '85c6fe7439fa1988ede1385f1d9cbc527f355d85' +Submodule 'subsubmodule' (/tmp/tmpxn7zi9z8/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpxn7zi9z8/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out '6378c0d6d5296cca6526b398fdb4d45fc2f6d19f' +Submodule path 'submodule/subsubmodule': checked out '65c75db38b0fb64ab8292afae21bb538c7eda8c5' ok -test_checkout_master_with_subs2 (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmprg1qo1qu/local'... +test_checkout_master_with_subs2 (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpxn7zi9z8/local'... done. ok -test_checkout_test_branch_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmprg1qo1qu/local'... +test_checkout_test_branch_with_subs (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpxn7zi9z8/local'... done. ok -test_diff (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmprg1qo1qu/local'... +test_diff (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpxn7zi9z8/local'... done. -Submodule 'submodule' (/tmp/tmprg1qo1qu/submodule) registered for path 'submodule' -Cloning into '/tmp/tmprg1qo1qu/local/submodule'... +Submodule 'submodule' (/tmp/tmpxn7zi9z8/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpxn7zi9z8/local/submodule'... done. -Submodule path 'submodule': checked out 'ecb516324ec59970b5a49e29f010d97a476072cc' -Submodule 'subsubmodule' (/tmp/tmprg1qo1qu/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmprg1qo1qu/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out '85c6fe7439fa1988ede1385f1d9cbc527f355d85' +Submodule 'subsubmodule' (/tmp/tmpxn7zi9z8/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpxn7zi9z8/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out '6378c0d6d5296cca6526b398fdb4d45fc2f6d19f' +Submodule path 'submodule/subsubmodule': checked out '65c75db38b0fb64ab8292afae21bb538c7eda8c5' ok -test_export_branch (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmprg1qo1qu/local'... +test_export_branch (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpxn7zi9z8/local'... done. -Cloning into '/tmp/tmp72jh34x2'... +Cloning into '/tmp/tmptvvk41_d'... warning: --depth is ignored in local clones; use file:// instead. done. ok -test_export_hash (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmprg1qo1qu/local'... +test_export_hash (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpxn7zi9z8/local'... done. -Cloning into '/tmp/tmpm3nbvoat'... +Cloning into '/tmp/tmpoy6kmhuo'... warning: --depth is ignored in local clones; use file:// instead. done. -Note: checking out '71a054e2f8332ea1e41cd0ae07cec67d9a104b33'. +Note: checking out '0661cf600d80a33d0bde7c15e8a0fc9357f590cb'. 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,148 +3346,148 @@ git checkout -b ok -test_export_master (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmprg1qo1qu/local'... +test_export_master (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpxn7zi9z8/local'... done. -Submodule 'submodule' (/tmp/tmprg1qo1qu/submodule) registered for path 'submodule' -Cloning into '/tmp/tmprg1qo1qu/local/submodule'... +Submodule 'submodule' (/tmp/tmpxn7zi9z8/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpxn7zi9z8/local/submodule'... done. -Submodule path 'submodule': checked out 'ecb516324ec59970b5a49e29f010d97a476072cc' -Submodule 'subsubmodule' (/tmp/tmprg1qo1qu/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmprg1qo1qu/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out '85c6fe7439fa1988ede1385f1d9cbc527f355d85' +Submodule 'subsubmodule' (/tmp/tmpxn7zi9z8/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpxn7zi9z8/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out '6378c0d6d5296cca6526b398fdb4d45fc2f6d19f' -Cloning into '/tmp/tmpx2587l1h'... +Submodule path 'submodule/subsubmodule': checked out '65c75db38b0fb64ab8292afae21bb538c7eda8c5' +Cloning into '/tmp/tmprkopdhhc'... warning: --depth is ignored in local clones; use file:// instead. done. ok -test_status (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmprg1qo1qu/local'... +test_status (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpxn7zi9z8/local'... done. -Submodule 'submodule' (/tmp/tmprg1qo1qu/submodule) registered for path 'submodule' -Cloning into '/tmp/tmprg1qo1qu/local/submodule'... +Submodule 'submodule' (/tmp/tmpxn7zi9z8/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpxn7zi9z8/local/submodule'... done. -Submodule path 'submodule': checked out 'ecb516324ec59970b5a49e29f010d97a476072cc' -Submodule 'subsubmodule' (/tmp/tmprg1qo1qu/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmprg1qo1qu/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out '85c6fe7439fa1988ede1385f1d9cbc527f355d85' +Submodule 'subsubmodule' (/tmp/tmpxn7zi9z8/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpxn7zi9z8/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out '6378c0d6d5296cca6526b398fdb4d45fc2f6d19f' +Submodule path 'submodule/subsubmodule': checked out '65c75db38b0fb64ab8292afae21bb538c7eda8c5' ok -test_switch_branches (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmprg1qo1qu/local'... +test_switch_branches (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpxn7zi9z8/local'... done. -Submodule 'submodule' (/tmp/tmprg1qo1qu/submodule) registered for path 'submodule' -Cloning into '/tmp/tmprg1qo1qu/local/submodule'... +Submodule 'submodule' (/tmp/tmpxn7zi9z8/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpxn7zi9z8/local/submodule'... done. -Submodule path 'submodule': checked out 'ecb516324ec59970b5a49e29f010d97a476072cc' -Submodule 'subsubmodule' (/tmp/tmprg1qo1qu/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmprg1qo1qu/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out '85c6fe7439fa1988ede1385f1d9cbc527f355d85' +Submodule 'subsubmodule' (/tmp/tmpxn7zi9z8/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpxn7zi9z8/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out '6378c0d6d5296cca6526b398fdb4d45fc2f6d19f' +Submodule path 'submodule/subsubmodule': checked out '65c75db38b0fb64ab8292afae21bb538c7eda8c5' ok -test_switch_branches_retrieve_local_subcommit (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmprg1qo1qu/local'... +test_switch_branches_retrieve_local_subcommit (test.test_git_subm.GitClientTest) ... Cloning into '/tmp/tmpxn7zi9z8/local'... done. -Submodule 'submodule' (/tmp/tmprg1qo1qu/submodule) registered for path 'submodule' -Cloning into '/tmp/tmprg1qo1qu/local/submodule'... +Submodule 'submodule' (/tmp/tmpxn7zi9z8/submodule) registered for path 'submodule' +Cloning into '/tmp/tmpxn7zi9z8/local/submodule'... done. -Submodule path 'submodule': checked out 'ecb516324ec59970b5a49e29f010d97a476072cc' -Submodule 'subsubmodule' (/tmp/tmprg1qo1qu/subsubmodule) registered for path 'submodule/subsubmodule' -Cloning into '/tmp/tmprg1qo1qu/local/submodule/subsubmodule'... +Submodule path 'submodule': checked out '85c6fe7439fa1988ede1385f1d9cbc527f355d85' +Submodule 'subsubmodule' (/tmp/tmpxn7zi9z8/subsubmodule) registered for path 'submodule/subsubmodule' +Cloning into '/tmp/tmpxn7zi9z8/local/submodule/subsubmodule'... done. -Submodule path 'submodule/subsubmodule': checked out '6378c0d6d5296cca6526b398fdb4d45fc2f6d19f' -[detached HEAD a8c69af] submodif +Submodule path 'submodule/subsubmodule': checked out '65c75db38b0fb64ab8292afae21bb538c7eda8c5' +[detached HEAD 527dc88] submodif Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 submodif.txt -[test_branch 1e5a8f6] submodule2_modif +[test_branch 6f89e00] submodule2_modif Author: Your Name 1 file changed, 1 insertion(+), 1 deletion(-) -marked working directory as branch test_branch +marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) -updating to branch default +sto aggiornando al 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/tmpi55_dnw6/local' is not empty -marked working directory as branch test_branch +test_get_log_defaults (test.test_hg.HGAffectedFilesTest) ... abortito: la destinazione '/tmp/tmp5m72ou2j/local' non ? vuota +marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) -updating to branch default +sto aggiornando al 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/tmp27kcei6p/local' is not empty +test_get_log_defaults (test.test_hg.HGClientLogTest) ... abortito: la destinazione '/tmp/tmp8h1rd7m4/local' non ? vuota ok -test_get_log_limit (test.test_hg.HGClientLogTest) ... updating to branch default +test_get_log_limit (test.test_hg.HGClientLogTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_get_log_path (test.test_hg.HGClientLogTest) ... updating to branch default +test_get_log_path (test.test_hg.HGClientLogTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -marked working directory as branch test_branch +marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) ok testDiffClean (test.test_hg.HGClientTest) ... ok testStatusClean (test.test_hg.HGClientTest) ... ok -test_checkout (test.test_hg.HGClientTest) ... updating to branch default +test_checkout (test.test_hg.HGClientTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_checkout_dir_exists (test.test_hg.HGClientTest) ... updating to branch default +test_checkout_dir_exists (test.test_hg.HGClientTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -abort: destination '/tmp/tmpyoai_2fz/local' is not empty +abortito: la destinazione '/tmp/tmpkd6tra9u/local' non ? vuota ok -test_checkout_emptystringversion (test.test_hg.HGClientTest) ... updating to branch default +test_checkout_emptystringversion (test.test_hg.HGClientTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_checkout_into_subdir_without_existing_parent (test.test_hg.HGClientTest) ... updating to branch default +test_checkout_into_subdir_without_existing_parent (test.test_hg.HGClientTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_checkout_specific_version_and_update (test.test_hg.HGClientTest) ... updating to branch default +test_checkout_specific_version_and_update (test.test_hg.HGClientTest) ... sto aggiornando al 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/tmpyoai_2fz/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpkd6tra9u/remote +sto cercando modifiche +nessuna modifica trovata 0 files updated, 0 files merged, 2 files removed, 0 files unresolved -pulling from /tmp/tmpyoai_2fz/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpkd6tra9u/remote +sto cercando modifiche +nessuna modifica trovata 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpyoai_2fz/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpkd6tra9u/remote +sto cercando modifiche +nessuna modifica trovata 0 files updated, 0 files merged, 2 files removed, 0 files unresolved -pulling from /tmp/tmpyoai_2fz/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpkd6tra9u/remote +sto cercando modifiche +nessuna modifica trovata 2 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_get_current_version_label (test.test_hg.HGClientTest) ... updating to branch default +test_get_current_version_label (test.test_hg.HGClientTest) ... sto aggiornando al 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/tmpyoai_2fz/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpkd6tra9u/remote +sto cercando modifiche +nessuna modifica trovata 5 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpyoai_2fz/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpkd6tra9u/remote +sto cercando modifiche +nessuna modifica trovata 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok test_get_environment_metadata (test.test_hg.HGClientTest) ... ok -test_get_remote_version (test.test_hg.HGClientTest) ... updating to branch default +test_get_remote_version (test.test_hg.HGClientTest) ... sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved -abort: destination '/tmp/tmpyoai_2fz/local' is not empty -pulling from /tmp/tmpyoai_2fz/remote -searching for changes -no changes found +abortito: la destinazione '/tmp/tmpkd6tra9u/local' non ? vuota +sto facendo pull da /tmp/tmpkd6tra9u/remote +sto cercando modifiche +nessuna modifica trovata 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from /tmp/tmpyoai_2fz/remote -searching for changes -no changes found +sto facendo pull da /tmp/tmpkd6tra9u/remote +sto cercando modifiche +nessuna modifica trovata 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok test_get_type_name (test.test_hg.HGClientTest) ... ok -test_get_url_by_reading (test.test_hg.HGClientTest) ... updating to branch default +test_get_url_by_reading (test.test_hg.HGClientTest) ... sto aggiornando al 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 ok -test_get_url_nonexistant (test.test_hg.HGClientTest) ... marked working directory as branch test_branch +test_get_url_nonexistant (test.test_hg.HGClientTest) ... marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) -updating to branch default +sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok testStatusUntracked (test.test_hg.HGDiffStatClientTest) ... ok @@ -3462,32 +3496,32 @@ test_get_version_modified (test.test_hg.HGDiffStatClientTest) ... ok test_hg_diff_path_change_None (test.test_hg.HGDiffStatClientTest) ... ok test_status (test.test_hg.HGDiffStatClientTest) ... ok -test_status_relpath (test.test_hg.HGDiffStatClientTest) ... marked working directory as branch test_branch +test_status_relpath (test.test_hg.HGDiffStatClientTest) ... marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) -updating to branch default +sto aggiornando al branch default 6 files updated, 0 files merged, 0 files removed, 0 files unresolved ok -test_export_repository (test.test_hg.HGExportRepositoryClientTest) ... marked working directory as branch test_branch +test_export_repository (test.test_hg.HGExportRepositoryClientTest) ... marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) -updating to branch default +sto aggiornando al 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/tmp38uc0115/remote -searching for changes -no changes found -fixed.txt already tracked! -pulling from /tmp/tmp38uc0115/remote -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 0 changes to 0 files -new changesets 1332bad72540 -(run 'hg update' to get a working copy) -marked working directory as branch test_branch +test_get_branches (test.test_hg.HGGetBranchesClientTest) ... sto facendo pull da /tmp/tmpd8jr6lec/remote +sto cercando modifiche +nessuna modifica trovata +fixed.txt ? gi? tracciato! +sto facendo pull da /tmp/tmpd8jr6lec/remote +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 0 modifiche a 0 file +new changesets dd00a11e018f +(esegui 'hg update' per ottenere una copia funzionante) +marcata directory di lavoro come branch test_branch (branches are permanent and global, did you want a bookmark?) ok -test_get_remote_version (test.test_hg.HGRemoteFetchTest) ... updating to branch default +test_get_remote_version (test.test_hg.HGRemoteFetchTest) ... sto aggiornando al 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 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -3524,14 +3558,14 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmps2j84qvb/local/deleted-fs.txt -A /tmp/tmps2j84qvb/local/deleted.txt -A /tmp/tmps2j84qvb/local/fixed.txt -A /tmp/tmps2j84qvb/local/modified-fs.txt -A /tmp/tmps2j84qvb/local/modified.txt +A /tmp/tmpw_rho2ti/local/deleted-fs.txt +A /tmp/tmpw_rho2ti/local/deleted.txt +A /tmp/tmpw_rho2ti/local/fixed.txt +A /tmp/tmpw_rho2ti/local/modified-fs.txt +A /tmp/tmpw_rho2ti/local/modified.txt Checked out revision 4. ok -test_get_affected_files (test.test_svn.SVNClientAffectedFiles) ... ERROR [vcstools] Can't remove /tmp/tmps2j84qvb/local[/vcstools] +test_get_affected_files (test.test_svn.SVNClientAffectedFiles) ... ERROR [vcstools] Can't remove /tmp/tmpw_rho2ti/local[/vcstools] Checked out revision 0. A trunk A branches @@ -3565,27 +3599,27 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmp92ho7f0t/local/deleted-fs.txt -A /tmp/tmp92ho7f0t/local/deleted.txt -A /tmp/tmp92ho7f0t/local/fixed.txt -A /tmp/tmp92ho7f0t/local/modified-fs.txt -A /tmp/tmp92ho7f0t/local/modified.txt -Checked out revision 4. -ok -test_get_log_defaults (test.test_svn.SvnClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmp92ho7f0t/local[/vcstools] -ok -test_get_log_limit (test.test_svn.SvnClientLogTest) ... A /tmp/tmp92ho7f0t/local/deleted-fs.txt -A /tmp/tmp92ho7f0t/local/deleted.txt -A /tmp/tmp92ho7f0t/local/fixed.txt -A /tmp/tmp92ho7f0t/local/modified-fs.txt -A /tmp/tmp92ho7f0t/local/modified.txt -Checked out revision 4. -ok -test_get_log_path (test.test_svn.SvnClientLogTest) ... A /tmp/tmp92ho7f0t/local/deleted-fs.txt -A /tmp/tmp92ho7f0t/local/deleted.txt -A /tmp/tmp92ho7f0t/local/fixed.txt -A /tmp/tmp92ho7f0t/local/modified-fs.txt -A /tmp/tmp92ho7f0t/local/modified.txt +A /tmp/tmp23fpbdla/local/deleted-fs.txt +A /tmp/tmp23fpbdla/local/deleted.txt +A /tmp/tmp23fpbdla/local/fixed.txt +A /tmp/tmp23fpbdla/local/modified-fs.txt +A /tmp/tmp23fpbdla/local/modified.txt +Checked out revision 4. +ok +test_get_log_defaults (test.test_svn.SvnClientLogTest) ... ERROR [vcstools] Can't remove /tmp/tmp23fpbdla/local[/vcstools] +ok +test_get_log_limit (test.test_svn.SvnClientLogTest) ... A /tmp/tmp23fpbdla/local/deleted-fs.txt +A /tmp/tmp23fpbdla/local/deleted.txt +A /tmp/tmp23fpbdla/local/fixed.txt +A /tmp/tmp23fpbdla/local/modified-fs.txt +A /tmp/tmp23fpbdla/local/modified.txt +Checked out revision 4. +ok +test_get_log_path (test.test_svn.SvnClientLogTest) ... A /tmp/tmp23fpbdla/local/deleted-fs.txt +A /tmp/tmp23fpbdla/local/deleted.txt +A /tmp/tmp23fpbdla/local/fixed.txt +A /tmp/tmp23fpbdla/local/modified-fs.txt +A /tmp/tmp23fpbdla/local/modified.txt Checked out revision 4. Checked out revision 0. A trunk @@ -3622,66 +3656,66 @@ Committed revision 4. ok testDiffClean (test.test_svn.SvnClientTest) ... WARNING [vcstools] Command failed: 'svn diff "."' - run at: '/tmp/tmpf34w9zqo/remote' + run at: '/tmp/tmpc4mlzbb6/remote' errcode: 1: -svn: E155007: '/tmp/tmpf34w9zqo/remote' is not a working copy +svn: E155007: '/tmp/tmpc4mlzbb6/remote' is not a working copy [/vcstools] ok testStatusClean (test.test_svn.SvnClientTest) ... ok -test_checkout (test.test_svn.SvnClientTest) ... A /tmp/tmpf34w9zqo/local/deleted-fs.txt -A /tmp/tmpf34w9zqo/local/deleted.txt -A /tmp/tmpf34w9zqo/local/fixed.txt -A /tmp/tmpf34w9zqo/local/modified-fs.txt -A /tmp/tmpf34w9zqo/local/modified.txt -Checked out revision 4. -ok -test_checkout_dir_exists (test.test_svn.SvnClientTest) ... A /tmp/tmpf34w9zqo/local/deleted-fs.txt -A /tmp/tmpf34w9zqo/local/deleted.txt -A /tmp/tmpf34w9zqo/local/fixed.txt -A /tmp/tmpf34w9zqo/local/modified-fs.txt -A /tmp/tmpf34w9zqo/local/modified.txt -Checked out revision 4. -ERROR [vcstools] Can't remove /tmp/tmpf34w9zqo/local[/vcstools] -ok -test_checkout_emptyversion (test.test_svn.SvnClientTest) ... A /tmp/tmpf34w9zqo/local/deleted-fs.txt -A /tmp/tmpf34w9zqo/local/deleted.txt -A /tmp/tmpf34w9zqo/local/fixed.txt -A /tmp/tmpf34w9zqo/local/modified-fs.txt -A /tmp/tmpf34w9zqo/local/modified.txt +test_checkout (test.test_svn.SvnClientTest) ... A /tmp/tmpc4mlzbb6/local/deleted-fs.txt +A /tmp/tmpc4mlzbb6/local/deleted.txt +A /tmp/tmpc4mlzbb6/local/fixed.txt +A /tmp/tmpc4mlzbb6/local/modified-fs.txt +A /tmp/tmpc4mlzbb6/local/modified.txt +Checked out revision 4. +ok +test_checkout_dir_exists (test.test_svn.SvnClientTest) ... A /tmp/tmpc4mlzbb6/local/deleted-fs.txt +A /tmp/tmpc4mlzbb6/local/deleted.txt +A /tmp/tmpc4mlzbb6/local/fixed.txt +A /tmp/tmpc4mlzbb6/local/modified-fs.txt +A /tmp/tmpc4mlzbb6/local/modified.txt +Checked out revision 4. +ERROR [vcstools] Can't remove /tmp/tmpc4mlzbb6/local[/vcstools] +ok +test_checkout_emptyversion (test.test_svn.SvnClientTest) ... A /tmp/tmpc4mlzbb6/local/deleted-fs.txt +A /tmp/tmpc4mlzbb6/local/deleted.txt +A /tmp/tmpc4mlzbb6/local/fixed.txt +A /tmp/tmpc4mlzbb6/local/modified-fs.txt +A /tmp/tmpc4mlzbb6/local/modified.txt Checked out revision 4. -Updating '/tmp/tmpf34w9zqo/local': +Updating '/tmp/tmpc4mlzbb6/local': At revision 4. -Updating '/tmp/tmpf34w9zqo/local': +Updating '/tmp/tmpc4mlzbb6/local': At revision 4. ok -using just a number as version ... A /tmp/tmpf34w9zqo/local/deleted-fs.txt -A /tmp/tmpf34w9zqo/local/deleted.txt -A /tmp/tmpf34w9zqo/local/fixed.txt -A /tmp/tmpf34w9zqo/local/modified-fs.txt -A /tmp/tmpf34w9zqo/local/modified.txt +using just a number as version ... A /tmp/tmpc4mlzbb6/local/deleted-fs.txt +A /tmp/tmpc4mlzbb6/local/deleted.txt +A /tmp/tmpc4mlzbb6/local/fixed.txt +A /tmp/tmpc4mlzbb6/local/modified-fs.txt +A /tmp/tmpc4mlzbb6/local/modified.txt Checked out revision 3. -Updating '/tmp/tmpf34w9zqo/local': -D /tmp/tmpf34w9zqo/local/deleted.txt -D /tmp/tmpf34w9zqo/local/deleted-fs.txt +Updating '/tmp/tmpc4mlzbb6/local': +D /tmp/tmpc4mlzbb6/local/deleted.txt +D /tmp/tmpc4mlzbb6/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/tmpf34w9zqo/local/modified.txt +test_get_remote_branch_version (test.test_svn.SvnClientTest) ... A /tmp/tmpc4mlzbb6/local/modified.txt Checked out revision 4. ok -test_get_remote_version (test.test_svn.SvnClientTest) ... A /tmp/tmpf34w9zqo/local/deleted-fs.txt -A /tmp/tmpf34w9zqo/local/deleted.txt -A /tmp/tmpf34w9zqo/local/fixed.txt -A /tmp/tmpf34w9zqo/local/modified-fs.txt -A /tmp/tmpf34w9zqo/local/modified.txt +test_get_remote_version (test.test_svn.SvnClientTest) ... A /tmp/tmpc4mlzbb6/local/deleted-fs.txt +A /tmp/tmpc4mlzbb6/local/deleted.txt +A /tmp/tmpc4mlzbb6/local/fixed.txt +A /tmp/tmpc4mlzbb6/local/modified-fs.txt +A /tmp/tmpc4mlzbb6/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/tmpf34w9zqo/local/deleted-fs.txt -A /tmp/tmpf34w9zqo/local/deleted.txt -A /tmp/tmpf34w9zqo/local/fixed.txt -A /tmp/tmpf34w9zqo/local/modified-fs.txt -A /tmp/tmpf34w9zqo/local/modified.txt +test_get_url_by_reading (test.test_svn.SvnClientTest) ... A /tmp/tmpc4mlzbb6/local/deleted-fs.txt +A /tmp/tmpc4mlzbb6/local/deleted.txt +A /tmp/tmpc4mlzbb6/local/fixed.txt +A /tmp/tmpc4mlzbb6/local/modified-fs.txt +A /tmp/tmpc4mlzbb6/local/modified.txt Checked out revision 4. ok test_get_url_nonexistant (test.test_svn.SvnClientTest) ... ok @@ -3718,11 +3752,11 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpexlqx3gr/local/deleted-fs.txt -A /tmp/tmpexlqx3gr/local/deleted.txt -A /tmp/tmpexlqx3gr/local/fixed.txt -A /tmp/tmpexlqx3gr/local/modified-fs.txt -A /tmp/tmpexlqx3gr/local/modified.txt +A /tmp/tmp4l1b6pan/local/deleted-fs.txt +A /tmp/tmp4l1b6pan/local/deleted.txt +A /tmp/tmp4l1b6pan/local/fixed.txt +A /tmp/tmp4l1b6pan/local/modified-fs.txt +A /tmp/tmp4l1b6pan/local/modified.txt Checked out revision 4. D deleted.txt A added.txt @@ -3764,11 +3798,11 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmp1bwktnk8/local/deleted-fs.txt -A /tmp/tmp1bwktnk8/local/deleted.txt -A /tmp/tmp1bwktnk8/local/fixed.txt -A /tmp/tmp1bwktnk8/local/modified-fs.txt -A /tmp/tmp1bwktnk8/local/modified.txt +A /tmp/tmp6sp6utim/local/deleted-fs.txt +A /tmp/tmp6sp6utim/local/deleted.txt +A /tmp/tmp6sp6utim/local/fixed.txt +A /tmp/tmp6sp6utim/local/modified-fs.txt +A /tmp/tmp6sp6utim/local/modified.txt Checked out revision 4. ok test_export_repository (test.test_svn.SvnExportRepositoryClientTest) ... Checked out revision 0. @@ -3804,11 +3838,11 @@ Transmitting file data .done Committing transaction... Committed revision 4. -A /tmp/tmpbw20vwuo/local/deleted-fs.txt -A /tmp/tmpbw20vwuo/local/deleted.txt -A /tmp/tmpbw20vwuo/local/fixed.txt -A /tmp/tmpbw20vwuo/local/modified-fs.txt -A /tmp/tmpbw20vwuo/local/modified.txt +A /tmp/tmpmuig6otq/local/deleted-fs.txt +A /tmp/tmpmuig6otq/local/deleted.txt +A /tmp/tmpmuig6otq/local/fixed.txt +A /tmp/tmpmuig6otq/local/modified-fs.txt +A /tmp/tmpmuig6otq/local/modified.txt Checked out revision 4. ok test_get_branches (test.test_svn.SvnGetBranchesClientTest) ... A branches/foo2 @@ -3817,7 +3851,7 @@ Adding branches/foo2 Committing transaction... Committed revision 5. -A /tmp/tmpbw20vwuo/local_foo/modified.txt +A /tmp/tmpmuig6otq/local_foo/modified.txt Checked out revision 5. ok test_get_branches_non_canonical (test.test_svn.SvnGetBranchesClientTest) ... Checked out revision 0. @@ -3830,8 +3864,8 @@ Transmitting file data .done Committing transaction... Committed revision 1. -A /tmp/tmpbw20vwuo/local_nc/foosub -A /tmp/tmpbw20vwuo/local_nc/foosub/fixed.txt +A /tmp/tmpmuig6otq/local_nc/foosub +A /tmp/tmpmuig6otq/local_nc/foosub/fixed.txt Checked out revision 1. ok test_get_remote_contents (test.test_svn.SvnGetBranchesClientTest) ... ok @@ -3849,7 +3883,7 @@ test_register_vcs (test.test_vcs_abstraction.TestVcsAbstraction) ... ok ---------------------------------------------------------------------- -Ran 147 tests in 723.481s +Ran 147 tests in 359.060s OK create-stamp debian/debhelper-build-stamp @@ -3867,38 +3901,38 @@ creating /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7 creating /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages creating /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/svn.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/__version__.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/hg.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/vcs_base.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/vcs_base.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/tar.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/vcs_abstraction.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/tar.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/vcs_abstraction.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/__init__.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/bzr.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/git_archive_all.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/common.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/git.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/bzr.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/hg.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/__init__.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/git_archive_all.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/vcs_base.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/vcs_abstraction.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/hg.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/__init__.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/svn.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/__version__.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/git.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/vcs_base.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/svn.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/common.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/git.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/hg.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/vcs_abstraction.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/git_archive_all.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/git.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools -byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/svn.py to svn.pyc -byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/__version__.py to __version__.pyc -byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/hg.py to hg.pyc -byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/vcs_base.py to vcs_base.pyc -byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/tar.py to tar.pyc -byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/vcs_abstraction.py to vcs_abstraction.pyc +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/tar.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/bzr.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/tar.py -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython2_2.7_vcstools/build/vcstools/svn.pyc -> /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/common.py to common.pyc byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/bzr.py to bzr.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/vcs_base.py to vcs_base.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/vcs_abstraction.py to vcs_abstraction.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/hg.py to hg.pyc byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/__init__.py to __init__.pyc -byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/git_archive_all.py to git_archive_all.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/__version__.py to __version__.pyc byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/git.py to git.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/svn.py to svn.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/git_archive_all.py to git_archive_all.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python-vcstools/usr/lib/python2.7/dist-packages/vcstools/tar.py to tar.pyc running install_egg_info running egg_info creating src/vcstools.egg-info @@ -3923,39 +3957,39 @@ creating /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7 creating /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages creating /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/svn.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__version__.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/hg.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/common.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/bzr.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/vcs_base.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/tar.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/vcs_abstraction.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools creating /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/bzr.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/__init__.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/svn.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/git_archive_all.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/common.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/hg.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/git.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/tar.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/vcs_base.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/git_archive_all.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/svn.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/__init__.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/vcs_abstraction.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/common.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/bzr.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/git.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/hg.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__pycache__/tar.cpython-37.pyc -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__pycache__ +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/vcs_abstraction.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/hg.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__init__.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools -copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/git_archive_all.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/__version__.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/git.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools -byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/svn.py to svn.cpython-37.pyc -byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__version__.py to __version__.cpython-37.pyc -byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/hg.py to hg.cpython-37.pyc -byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/vcs_base.py to vcs_base.cpython-37.pyc -byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/tar.py to tar.cpython-37.pyc -byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/vcs_abstraction.py to vcs_abstraction.cpython-37.pyc +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/svn.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/git_archive_all.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools +copying /build/ros-vcstools-0.1.40/.pybuild/cpython3_3.7_vcstools/build/vcstools/tar.py -> /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/common.py to common.cpython-37.pyc byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/bzr.py to bzr.cpython-37.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/vcs_base.py to vcs_base.cpython-37.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/vcs_abstraction.py to vcs_abstraction.cpython-37.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/hg.py to hg.cpython-37.pyc byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__init__.py to __init__.cpython-37.pyc -byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/git_archive_all.py to git_archive_all.cpython-37.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/__version__.py to __version__.cpython-37.pyc byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/git.py to git.cpython-37.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/svn.py to svn.cpython-37.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/git_archive_all.py to git_archive_all.cpython-37.pyc +byte-compiling /build/ros-vcstools-0.1.40/debian/python3-vcstools/usr/lib/python3.7/dist-packages/vcstools/tar.py to tar.cpython-37.pyc running install_egg_info running egg_info writing src/vcstools.egg-info/PKG-INFO @@ -3993,12 +4027,14 @@ dpkg-source: info: using options from ros-vcstools-0.1.40/debian/source/options: --extend-diff-ignore=^[^/]*[.]egg-info/ dpkg-buildpackage: info: binary-only upload (no source included) I: copying local configuration +I: user script /srv/workspace/pbuilder/23763/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/23763/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/19803 and its subdirectories -I: Current time: Sun Sep 27 16:48:21 -12 2020 -I: pbuilder-time-stamp: 1601268501 +I: removing directory /srv/workspace/pbuilder/23763 and its subdirectories +I: Current time: Mon Sep 28 19:04:06 +14 2020 +I: pbuilder-time-stamp: 1601269446