Attachment 904267 Details for Bug 1106236 – build.log

build.log

<fdopen> (text/plain), 708.93 KB, created by Dennis Gilmore on 2014-06-09 04:02:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dennis Gilmore

Created: 2014-06-09 04:02:58 UTC

Size: 708.93 KB

patch

obsolete

>Mock Version: 1.1.39
>Mock Version: 1.1.39
>ENTER do(['bash', '--login', '-c', 'rpmbuild -bs --target x86_64 --nodeps builddir/build/SPECS/monotone.spec'], False, '/var/lib/mock/f21-build-2126524-392863/root/', None, 86400, True, False, 1000, 425, None, False, {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'PROMPT_COMMAND': 'echo -n "<mock-chroot>"', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}, logger=<mockbuild.trace_decorator.getLog object at 0x125db90>)
>Executing command: ['bash', '--login', '-c', 'rpmbuild -bs --target x86_64 --nodeps builddir/build/SPECS/monotone.spec'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'PROMPT_COMMAND': 'echo -n "<mock-chroot>"', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
>warning: Could not canonicalize hostname: buildhw-01.phx2.fedoraproject.org
>Building target platforms: x86_64
>Building for target x86_64
>Wrote: /builddir/build/SRPMS/monotone-1.0-17.fc21.src.rpm
>Child return code was: 0
>LEAVE do --> 
>
>ENTER do(['bash', '--login', '-c', 'rpmbuild -bb --target x86_64 --nodeps  builddir/build/SPECS/monotone.spec'], False, '/var/lib/mock/f21-build-2126524-392863/root/', None, 86400, True, False, 1000, 425, None, False, {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'PROMPT_COMMAND': 'echo -n "<mock-chroot>"', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}, logger=<mockbuild.trace_decorator.getLog object at 0x125db90>)
>Executing command: ['bash', '--login', '-c', 'rpmbuild -bb --target x86_64 --nodeps  builddir/build/SPECS/monotone.spec'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'PROMPT_COMMAND': 'echo -n "<mock-chroot>"', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
>Building target platforms: x86_64
>Building for target x86_64
>Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.1EwfGM
>+ umask 022
>+ cd /builddir/build/BUILD
>+ cd /builddir/build/BUILD
>+ rm -rf monotone-1.0
>+ /usr/bin/bzip2 -dc /builddir/build/SOURCES/monotone-1.0.tar.bz2
>+ /usr/bin/tar -xf -
>+ STATUS=0
>+ '[' 0 -ne 0 ']'
>+ cd monotone-1.0
>+ /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
>Patch #0 (monotone-1.0-file_handle.patch):
>+ echo 'Patch #0 (monotone-1.0-file_handle.patch):'
>+ /usr/bin/cat /builddir/build/SOURCES/monotone-1.0-file_handle.patch
>+ /usr/bin/patch -p0 --fuzz=0
>patching file src/rcs_file.cc
>Patch #1 (monotone-1.0-fix-help.patch):
>+ echo 'Patch #1 (monotone-1.0-fix-help.patch):'
>+ /usr/bin/cat /builddir/build/SOURCES/monotone-1.0-fix-help.patch
>+ /usr/bin/patch -p0 --fuzz=0
>patching file src/options_list.hh
>Patch #2 (monotone-1.0-disable-xdelta-test.patch):
>+ echo 'Patch #2 (monotone-1.0-disable-xdelta-test.patch):'
>+ /usr/bin/cat /builddir/build/SOURCES/monotone-1.0-disable-xdelta-test.patch
>+ /usr/bin/patch -p1 --fuzz=0
>patching file Makefile.am
>patching file Makefile.in
>Patch #3 (monotone-1.0-pcre.patch):
>+ echo 'Patch #3 (monotone-1.0-pcre.patch):'
>+ /usr/bin/cat /builddir/build/SOURCES/monotone-1.0-pcre.patch
>+ /usr/bin/patch -p1 --fuzz=0
>patching file test/func/syntax_errors_in_.mtn-ignore/mtn-ignore
>Patch #4 (monotone-1.0-fix-bash_completion-test.patch):
>+ echo 'Patch #4 (monotone-1.0-fix-bash_completion-test.patch):'
>+ /usr/bin/cat /builddir/build/SOURCES/monotone-1.0-fix-bash_completion-test.patch
>+ /usr/bin/patch -p1 --fuzz=0
>patching file test/extra/bash_completion/bashrc
>patching file test/extra/bash_completion/library.exp
>Patch #5 (monotone-1.0-fix-diff_patch_drop-test.patch):
>+ echo 'Patch #5 (monotone-1.0-fix-diff_patch_drop-test.patch):'
>+ /usr/bin/cat /builddir/build/SOURCES/monotone-1.0-fix-diff_patch_drop-test.patch
>+ /usr/bin/patch -p1 --fuzz=0
>patching file test/func/diff_patch_drop/__driver__.lua
>Patch #6 (monotone-1.0-botan-1.10.patch):
>+ echo 'Patch #6 (monotone-1.0-botan-1.10.patch):'
>+ /usr/bin/cat /builddir/build/SOURCES/monotone-1.0-botan-1.10.patch
>+ /usr/bin/patch -p1 --fuzz=0
>patching file src/database.cc
>patching file src/gzip.cc
>patching file src/gzip.hh
>patching file src/key_packet.cc
>patching file src/key_store.cc
>patching file src/monotone.cc
>patching file src/packet.cc
>patching file src/packet.hh
>patching file src/sha1.cc
>patching file src/ssh_agent.cc
>patching file src/transforms.cc
>Patch #7 (monotone-1.0-lua-5.2.patch):
>+ echo 'Patch #7 (monotone-1.0-lua-5.2.patch):'
>+ /usr/bin/cat /builddir/build/SOURCES/monotone-1.0-lua-5.2.patch
>+ /usr/bin/patch -p1 --fuzz=0
>patching file extra/mtn-hooks/monotone-cvs-ignore.lua
>patching file src/lua.cc
>patching file src/lua.hh
>patching file src/luaext_parse_basic_io.cc
>patching file src/luaext_platform.cc
>patching file src/std_hooks.lua
>patching file test/func-testsuite.lua
>patching file test/func/automate_get_attributes/__driver__.lua
>patching file test/func/automate_interface_version/__driver__.lua
>patching file test/func/automate_inventory_ignore_dirs/__driver__.lua
>patching file test/func/automate_put_revision/__driver__.lua
>patching file test/func/automate_set_drop_attribute/__driver__.lua
>patching file test/func/automate_stdio_band_output/__driver__.lua
>patching file test/func/clone_weird_branch_names/__driver__.lua
>patching file test/func/list_databases/__driver__.lua
>patching file test/func/list_workspaces/__driver__.lua
>patching file test/func/log_--no-files_and_--merges/__driver__.lua
>patching file test/func/manpage/__driver__.lua
>patching file test/func/netsync_negotiation/__driver__.lua
>patching file test/func/serve-automate-single-run/__driver__.lua
>patching file test/func/serve-automate/__driver__.lua
>patching file test/func/ssh_agent/__driver__.lua
>patching file test/func/two_parent_workspace_inodeprints/__driver__.lua
>patching file test/func/user_commands/extra_rc
>patching file test/src/testlib.lua
>Patch #8 (monotone-1.0-fix-texinfo.patch):
>+ echo 'Patch #8 (monotone-1.0-fix-texinfo.patch):'
>+ /usr/bin/cat /builddir/build/SOURCES/monotone-1.0-fix-texinfo.patch
>+ /usr/bin/patch -p1 --fuzz=0
>patching file doc/monotone.texi
>patching file doc/pcrepattern.texi
>+ sed -e 's|shared_dynamic_cast|dynamic_pointer_cast|g' -i src/key_store.cc src/ssh_agent.cc src/database.cc
>+ exit 0
>Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.QfD25e
>+ umask 022
>+ cd /builddir/build/BUILD
>+ cd monotone-1.0
>+ export LC_MESSAGES=en_US
>+ LC_MESSAGES=en_US
>+ CFLAGS='-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic'
>+ export CFLAGS
>+ CXXFLAGS='-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic'
>+ export CXXFLAGS
>+ FFLAGS='-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -I/usr/lib64/gfortran/modules'
>+ export FFLAGS
>+ FCFLAGS='-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -I/usr/lib64/gfortran/modules'
>+ export FCFLAGS
>+ LDFLAGS='-Wl,-z,relro '
>+ export LDFLAGS
>+ '[' 1 = 1 ']'
>++ find . -name config.guess -o -name config.sub
>+ for i in '$(find . -name config.guess -o -name config.sub)'
>++ basename ./config.sub
>+ '[' -f /usr/lib/rpm/redhat/config.sub ']'
>+ /usr/bin/rm -f ./config.sub
>++ basename ./config.sub
>+ /usr/bin/cp -fv /usr/lib/rpm/redhat/config.sub ./config.sub
>'/usr/lib/rpm/redhat/config.sub' -> './config.sub'
>+ for i in '$(find . -name config.guess -o -name config.sub)'
>++ basename ./config.guess
>+ '[' -f /usr/lib/rpm/redhat/config.guess ']'
>+ /usr/bin/rm -f ./config.guess
>++ basename ./config.guess
>+ /usr/bin/cp -fv /usr/lib/rpm/redhat/config.guess ./config.guess
>'/usr/lib/rpm/redhat/config.guess' -> './config.guess'
>+ '[' 1 = 1 ']'
>+ '[' x '!=' x ']'
>+ ./configure --build=x86_64-redhat-linux-gnu --host=x86_64-redhat-linux-gnu --program-prefix= --disable-dependency-tracking --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/var/lib --mandir=/usr/share/man --infodir=/usr/share/info
>checking for a BSD-compatible install... /usr/bin/install -c
>checking whether build environment is sane... yes
>checking for a thread-safe mkdir -p... /usr/bin/mkdir -p
>checking for gawk... gawk
>checking whether make sets $(MAKE)... yes
>checking how to create a ustar tar archive... gnutar
>checking build system type... x86_64-redhat-linux-gnu
>checking host system type... x86_64-redhat-linux-gnu
>checking category of operating system... Unix
>checking for x86_64-redhat-linux-gnu-g++... no
>checking for x86_64-redhat-linux-gnu-c++... no
>checking for x86_64-redhat-linux-gnu-gpp... no
>checking for x86_64-redhat-linux-gnu-aCC... no
>checking for x86_64-redhat-linux-gnu-CC... no
>checking for x86_64-redhat-linux-gnu-cxx... no
>checking for x86_64-redhat-linux-gnu-cc++... no
>checking for x86_64-redhat-linux-gnu-cl.exe... no
>checking for x86_64-redhat-linux-gnu-FCC... no
>checking for x86_64-redhat-linux-gnu-KCC... no
>checking for x86_64-redhat-linux-gnu-RCC... no
>checking for x86_64-redhat-linux-gnu-xlC_r... no
>checking for x86_64-redhat-linux-gnu-xlC... no
>checking for g++... g++
>checking whether the C++ compiler works... yes
>checking for C++ compiler default output file name... a.out
>checking for suffix of executables... 
>checking whether we are cross compiling... no
>checking for suffix of object files... o
>checking whether we are using the GNU C++ compiler... yes
>checking whether g++ accepts -g... yes
>checking for style of include used by make... GNU
>checking dependency style of g++... none
>checking for C++ compiler warning flags... -Wall -W -Wno-unused
>checking for x86_64-redhat-linux-gnu-ranlib... no
>checking for ranlib... ranlib
>checking for GNU msgfmt... not found
>checking for GNU msgmerge... not found
>checking for GNU xgettext... not found
>checking for libraries containing GNU gettext and ngettext... none required
>checking for library containing deflate... -lz
>checking boost version 1.33.0 or newer... 
>checking for x86_64-redhat-linux-gnu-pkg-config... /usr/bin/x86_64-redhat-linux-gnu-pkg-config
>checking pkg-config is at least version 0.9.0... yes
>checking for grep that handles long lines and -e... /usr/bin/grep
>checking for egrep... /usr/bin/grep -E
>checking for botan... no
>botan.pc not found
>checking for botan using botan-1.10.pc... yes
>checking whether botan is usable... yes
>checking for idn... no
>idn.pc not found
>checking for idn using libidn.pc... yes
>checking whether idn is usable... yes
>checking for lua... yes
>checking whether lua is usable... yes
>checking for pcre... no
>pcre.pc not found
>checking for pcre using libpcre.pc... yes
>checking whether pcre is usable... yes
>checking for sqlite3... yes
>checking whether sqlite3 is usable... yes
>checking for sockaddr_in6... yes
>checking for library containing gethostbyname... none required
>checking for library containing accept... none required
>checking for library containing inet_aton... none required
>checking for gethostbyaddr... yes
>checking for inet_ntoa... yes
>checking for socket... yes
>checking for inet_pton... yes
>checking for inet_ntop... yes
>checking for getaddrinfo... yes
>checking whether INADDR_NONE is defined... yes
>checking for socklen_t... yes
>checking for cxxabi.h... yes
>checking for fcntl.h... yes
>checking for netinet/in.h... yes
>checking whether the compiler supports typeof... yes
>checking whether the compiler supports extern template... yes
>checking whether the compiler supports __gnu_cxx::hash_map... yes
>checking whether the compiler supports std::hash_map... no
>checking whether the compiler supports tr1::unordered_map... yes
>checking for early 4.0-series g++ bug in tr1 hashtables... no
>checking whether C++ streams support sync_with_stdio... yes
>checking whether g++ handles templates with static const members correctly... yes
>checking whether char has 8 bits... yes
>checking whether plain char is signed... yes
>checking size of short... 2
>checking size of long... 8
>checking size of int... 4
>checking for off_t... yes
>checking for pid_t... yes
>checking for struct stat.st_ctim.tv_nsec... yes
>checking for struct stat.st_mtim.tv_nsec... yes
>checking for struct stat.st_ctimespec.tv_nsec... no
>checking for struct stat.st_mtimespec.tv_nsec... no
>checking for struct stat.st_ctimensec... no
>checking for struct stat.st_mtimensec... no
>checking for struct dirent.d_type... yes
>checking for __cxa_current_exception_type... yes
>checking for __cxa_demangle... yes
>checking for dirfd... yes
>checking for fstatat... yes
>checking for mkdtemp... yes
>checking for mmap... yes
>checking for putenv... yes
>checking for setenv... yes
>checking for strptime... yes
>checking for unsetenv... yes
>configure: creating ./config.status
>config.status: creating Makefile
>config.status: creating doc/Makefile
>config.status: creating config.h
>config.status: executing depfiles commands
>+ make -j16
>make  all-recursive
>make[1]: Entering directory `/builddir/build/BUILD/monotone-1.0'
>Making all in doc
>make[2]: Entering directory `/builddir/build/BUILD/monotone-1.0/doc'
>Updating ./version.texi
>restore=: && backupdir=".am$$" && \
>am__cwd=`pwd` && CDPATH="${ZSH_VERSION+.}:" && cd . && \
>rm -rf $backupdir && mkdir $backupdir && \
>if (/bin/sh /builddir/build/BUILD/monotone-1.0/missing --run makeinfo --version) >/dev/null 2>&1; then \
>  for f in monotone.info monotone.info-[0-9] monotone.info-[0-9][0-9] monotone.i[0-9] monotone.i[0-9][0-9]; do \
>    if test -f $f; then mv $f $backupdir; restore=mv; else :; fi; \
>  done; \
>else :; fi && \
>cd "$am__cwd"; \
>if /bin/sh /builddir/build/BUILD/monotone-1.0/missing --run makeinfo -I ../src -I .  -I . \
> -o monotone.info monotone.texi; \
>then \
>  rc=0; \
>  CDPATH="${ZSH_VERSION+.}:" && cd .; \
>else \
>  rc=$?; \
>  CDPATH="${ZSH_VERSION+.}:" && cd . && \
>  $restore $backupdir/* `echo "./monotone.info" | sed 's|[^/]*$||'`; \
>fi; \
>rm -rf $backupdir; exit $rc
>/builddir/build/BUILD/monotone-1.0/missing: line 52: makeinfo: command not found
>WARNING: `makeinfo' is missing on your system.  You should only need it if
>         you modified a `.texi' or `.texinfo' file, or any other file
>         indirectly affecting the aspect of the manual.  The spurious
>         call might also be the consequence of using a buggy `make' (AIX,
>         DU, IRIX).  You might want to install the `Texinfo' package or
>         the `GNU make' package.  Grab either from any GNU archive site.
>make[2]: Leaving directory `/builddir/build/BUILD/monotone-1.0/doc'
>make[2]: Entering directory `/builddir/build/BUILD/monotone-1.0'
>REAL_BLDDIR=$PWD/.; \
>(cd . && $REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >src/package_revision_raw.txt \
>|| (cd . && mtn --root=. automate get_base_revision_id) 2>/dev/null >src/package_revision_raw.txt \
>|| rm -f src/package_revision_raw.txt
>g++ -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -o util/txt2c util/txt2c.cc
>REAL_BLDDIR=$PWD/.; \
>(cd . && $REAL_BLDDIR/mtn --root=. automate get_current_revision) 2>/dev/null >src/package_full_revision_raw.txt \
>|| (cd . && mtn --root=. automate get_current_revision) 2>/dev/null >src/package_full_revision_raw.txt \
>|| rm -f src/package_full_revision_raw.txt
>\
>#	source='src/option.cc' object='src/option.o' libtool=no 
>\
>#	source='src/options.cc' object='src/options.o' libtool=no 
>\
>#	source='src/options_applicator.cc' object='src/options_applicator.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/option.o src/option.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/options.o src/options.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/options_applicator.o src/options_applicator.cc
>\
>#	source='src/specialized_lexical_cast.cc' object='src/specialized_lexical_cast.o' libtool=no 
>\
>#	source='src/monotone.cc' object='src/monotone.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/specialized_lexical_cast.o src/specialized_lexical_cast.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/monotone.o src/monotone.cc
>\
>#	source='src/unix/main.cc' object='src/unix/main.o' libtool=no 
>sed -e 's,[@]PACKAGE_VERSION[@],1.0,' -e 's,[@]sysconfdir[@],/etc,' < src/util/mtnopt.in > mtnopt && chmod +x mtnopt
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/unix/main.o src/unix/main.cc
>/usr/bin/mkdir -p extra/building
>sed -e 's,[@]PACKAGE_VERSION[@],1.0,' -e 's,[@]sysconfdir[@],/etc,' < extra/building/dump-test-logs.sh.in > extra/building/dump-test-logs.sh && chmod +x extra/building/dump-test-logs.sh
>make[2]: Circular po/sv.gmo <- po/sv.gmo dependency dropped.
>make[2]: Circular po/it.gmo <- po/it.gmo dependency dropped.
>make[2]: Circular po/de.gmo <- po/de.gmo dependency dropped.
>make[2]: Circular po/pt.gmo <- po/pt.gmo dependency dropped.
>make[2]: Circular po/fr.gmo <- po/fr.gmo dependency dropped.
>\
>#	source='src/unix/read_password.cc' object='src/unix/read_password.o' libtool=no 
>\
>#	source='src/unix/get_system_flavour.cc' object='src/unix/get_system_flavour.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/unix/read_password.o src/unix/read_password.cc
>\
>#	source='src/unix/process.cc' object='src/unix/process.o' libtool=no 
>\
>#	source='src/unix/terminal.cc' object='src/unix/terminal.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/unix/get_system_flavour.o src/unix/get_system_flavour.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/unix/process.o src/unix/process.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/unix/terminal.o src/unix/terminal.cc
>\
>#	source='src/unix/inodeprint.cc' object='src/unix/inodeprint.o' libtool=no 
>\
>#	source='src/unix/fs.cc' object='src/unix/fs.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/unix/inodeprint.o src/unix/inodeprint.cc
>g++ -DLOCALEDIR="\"/usr/share/locale\"" -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/unix/fs.o src/unix/fs.cc
>\
>#	source='src/unix/make_io_binary.cc' object='src/unix/make_io_binary.o' libtool=no 
>\
>#	source='src/unix/os_strerror.cc' object='src/unix/os_strerror.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/unix/make_io_binary.o src/unix/make_io_binary.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/unix/os_strerror.o src/unix/os_strerror.cc
>\
>#	source='src/unix/cputime.cc' object='src/unix/cputime.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/unix/cputime.o src/unix/cputime.cc
>\
>#	source='src/unix/ssh_agent_platform.cc' object='src/unix/ssh_agent_platform.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/unix/ssh_agent_platform.o src/unix/ssh_agent_platform.cc
>src/unix/main.cc: In function 'void write_str_to_stderr(const char*)':
>src/unix/main.cc:50:25: warning: ignoring return value of 'ssize_t write(int, const void*, size_t)', declared with attribute warn_unused_result [-Wunused-result]
>   write(2, s, strlen(s));
>                         ^
>\
>#	source='src/unix/parse_date.cc' object='src/unix/parse_date.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/unix/parse_date.o src/unix/parse_date.cc
>\
>#	source='src/netxx/accept.cxx' object='src/netxx/accept.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/accept.o src/netxx/accept.cxx
>\
>#	source='src/netxx/address.cxx' object='src/netxx/address.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/address.o src/netxx/address.cxx
>\
>#	source='src/netxx/datagram.cxx' object='src/netxx/datagram.o' libtool=no 
>\
>#	source='src/netxx/datagramserver.cxx' object='src/netxx/datagramserver.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/datagram.o src/netxx/datagram.cxx
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/datagramserver.o src/netxx/datagramserver.cxx
>\
>#	source='src/netxx/osutil.cxx' object='src/netxx/osutil.o' libtool=no 
>\
>#	source='src/netxx/peer.cxx' object='src/netxx/peer.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/osutil.o src/netxx/osutil.cxx
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/peer.o src/netxx/peer.cxx
>\
>#	source='src/netxx/probe.cxx' object='src/netxx/probe.o' libtool=no 
>\
>#	source='src/netxx/probe_select.cxx' object='src/netxx/probe_select.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/probe.o src/netxx/probe.cxx
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/probe_select.o src/netxx/probe_select.cxx
>\
>#	source='src/netxx/recvfrom.cxx' object='src/netxx/recvfrom.o' libtool=no 
>\
>#	source='src/netxx/serverbase.cxx' object='src/netxx/serverbase.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/recvfrom.o src/netxx/recvfrom.cxx
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/serverbase.o src/netxx/serverbase.cxx
>\
>#	source='src/netxx/sockaddr.cxx' object='src/netxx/sockaddr.o' libtool=no 
>\
>#	source='src/netxx/socket.cxx' object='src/netxx/socket.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/sockaddr.o src/netxx/sockaddr.cxx
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/socket.o src/netxx/socket.cxx
>\
>#	source='src/netxx/sockopt.cxx' object='src/netxx/sockopt.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/sockopt.o src/netxx/sockopt.cxx
>\
>#	source='src/netxx/stream.cxx' object='src/netxx/stream.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/stream.o src/netxx/stream.cxx
>\
>#	source='src/netxx/streambase.cxx' object='src/netxx/streambase.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/streambase.o src/netxx/streambase.cxx
>\
>#	source='src/netxx/streamserver.cxx' object='src/netxx/streamserver.o' libtool=no 
>\
>#	source='src/netxx/resolve_getaddrinfo.cxx' object='src/netxx/resolve_getaddrinfo.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/streamserver.o src/netxx/streamserver.cxx
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx/resolve_getaddrinfo.o src/netxx/resolve_getaddrinfo.cxx
>\
>#	source='src/sanity.cc' object='src/sanity.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/sanity.o src/sanity.cc
>\
>#	source='src/simplestring_xform.cc' object='src/simplestring_xform.o' libtool=no 
>\
>#	source='src/constants.cc' object='src/constants.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/simplestring_xform.o src/simplestring_xform.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/constants.o src/constants.cc
>\
>#	source='src/vocab.cc' object='src/vocab.o' libtool=no 
>\
>#	source='src/charset.cc' object='src/charset.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/vocab.o src/vocab.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/charset.o src/charset.cc
>\
>#	source='src/paths.cc' object='src/paths.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/paths.o src/paths.cc
>\
>#	source='src/luaext_mkstemp.cc' object='src/luaext_mkstemp.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/luaext_mkstemp.o src/luaext_mkstemp.cc
>\
>#	source='src/luaext_parse_basic_io.cc' object='src/luaext_parse_basic_io.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/luaext_parse_basic_io.o src/luaext_parse_basic_io.cc
>\
>#	source='src/luaext_guess_binary.cc' object='src/luaext_guess_binary.o' libtool=no 
>\
>#	source='src/luaext_platform.cc' object='src/luaext_platform.o' libtool=no 
>In file included from src/simplestring_xform.cc:11:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/luaext_guess_binary.o src/luaext_guess_binary.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/luaext_platform.o src/luaext_platform.cc
>\
>#	source='src/luaext_globish.cc' object='src/luaext_globish.o' libtool=no 
>\
>#	source='src/lua.cc' object='src/lua.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/luaext_globish.o src/luaext_globish.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/lua.o src/lua.cc
>\
>#	source='src/mkstemp.cc' object='src/mkstemp.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/mkstemp.o src/mkstemp.cc
>In file included from src/options.cc:282:0:
>src/options_list.hh:126:54: warning: unused parameter 'arg' [-Wunused-parameter]
> void set_simple_option(bool & t, std::string const & arg)
>                                                      ^
>src/options.cc:275:48: warning: unused parameter 'arg' [-Wunused-parameter]
>   void options::real_set_ ## name (std::string arg)
>                                                ^
>src/options_list.hh:205:1: note: in expansion of macro 'OPTION'
> OPTION(globals, xargs, true, "xargs,@",
> ^
>src/options.cc:275:48: warning: unused parameter 'arg' [-Wunused-parameter]
>   void options::real_set_ ## name (std::string arg)
>                                                ^
>src/options_list.hh:336:1: note: in expansion of macro 'OPTION'
> OPTION(diff_options, diff_context, false, "context",
> ^
>src/options.cc:275:48: warning: unused parameter 'arg' [-Wunused-parameter]
>   void options::real_set_ ## name (std::string arg)
>                                                ^
>src/options_list.hh:343:1: note: in expansion of macro 'OPTION'
> OPTION(diff_options, diff_external, false, "external",
> ^
>src/options.cc:275:48: warning: unused parameter 'arg' [-Wunused-parameter]
>   void options::real_set_ ## name (std::string arg)
>                                                ^
>src/options_list.hh:350:1: note: in expansion of macro 'OPTION'
> OPTION(diff_options, diff_unified, false, "unified",
> ^
>src/options.cc:275:48: warning: unused parameter 'arg' [-Wunused-parameter]
>   void options::real_set_ ## name (std::string arg)
>                                                ^
>src/options_list.hh:471:1: note: in expansion of macro 'OPTION'
> OPTION(globals, old_norc, false, "norc",
> ^
>src/options.cc:275:48: warning: unused parameter 'arg' [-Wunused-parameter]
>   void options::real_set_ ## name (std::string arg)
>                                                ^
>src/options_list.hh:477:1: note: in expansion of macro 'OPTION'
> OPTION(globals, old_nostd, false, "nostd",
> ^
>src/options.cc:275:48: warning: unused parameter 'arg' [-Wunused-parameter]
>   void options::real_set_ ## name (std::string arg)
>                                                ^
>src/options_list.hh:493:1: note: in expansion of macro 'OPTION'
> OPTION(verbosity, quiet, false, "quiet,q",
> ^
>src/options.cc:275:48: warning: unused parameter 'arg' [-Wunused-parameter]
>   void options::real_set_ ## name (std::string arg)
>                                                ^
>src/options_list.hh:502:1: note: in expansion of macro 'OPTION'
> OPTION(verbosity, verbose, false, "verbose,v",
> ^
>src/options.cc:275:48: warning: unused parameter 'arg' [-Wunused-parameter]
>   void options::real_set_ ## name (std::string arg)
>                                                ^
>src/options_list.hh:515:1: note: in expansion of macro 'OPTION'
> OPTION(globals, debug, false, "debug",
> ^
>src/options.cc:275:48: warning: unused parameter 'arg' [-Wunused-parameter]
>   void options::real_set_ ## name (std::string arg)
>                                                ^
>src/options_list.hh:524:1: note: in expansion of macro 'OPTION'
> OPTION(verbosity, reallyquiet, false, "reallyquiet",
> ^
>In file included from src/options.cc:15:0:
>src/options.hh: In instantiation of 'restricted_long<low>::restricted_long(const string&, origin::type) [with long int low = 1l; std::string = std::basic_string<char>]':
>src/options_list.hh:118:5:   required from 'void set_simple_option(T&, const string&) [with T = restricted_long<1l>; std::string = std::basic_string<char>]'
>src/options_list.hh:215:1:   required from here
>src/options.hh:42:55: warning: unused parameter 'o' [-Wunused-parameter]
>   restricted_long(std::string const & x, origin::type o)
>                                                       ^
>src/options.hh: In instantiation of 'restricted_long<low>::restricted_long(const string&, origin::type) [with long int low = 0l; std::string = std::basic_string<char>]':
>src/options_list.hh:118:5:   required from 'void set_simple_option(T&, const string&) [with T = restricted_long<0l>; std::string = std::basic_string<char>]'
>src/options_list.hh:317:1:   required from here
>src/options.hh:42:55: warning: unused parameter 'o' [-Wunused-parameter]
>\
>#	source='src/file_io.cc' object='src/file_io.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/file_io.o src/file_io.cc
>In file included from src/charset.cc:20:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/globish.cc' object='src/globish.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/globish.o src/globish.cc
>\
>#	source='src/basic_io.cc' object='src/basic_io.o' libtool=no 
>src/luaext_platform.cc: In function 'int io_pclose(lua_State*)':
>src/luaext_platform.cc:133:26: warning: 'ok' may be used uninitialized in this function [-Wmaybe-uninitialized]
>   lua_pushboolean(LS, ok);
>                          ^
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/basic_io.o src/basic_io.cc
>\
>#	source='src/mtn-sanity.cc' object='src/mtn-sanity.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/mtn-sanity.o src/mtn-sanity.cc
>\
>#	source='src/ui.cc' object='src/ui.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/ui.o src/ui.cc
>\
>#	source='src/app_state.cc' object='src/app_state.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/app_state.o src/app_state.cc
>\
>#	source='src/automate_reader.cc' object='src/automate_reader.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/automate_reader.o src/automate_reader.cc
>In file included from src/monotone.cc:32:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/cache_logger.cc' object='src/cache_logger.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cache_logger.o src/cache_logger.cc
>\
>#	source='src/commands.cc' object='src/commands.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/commands.o src/commands.cc
>\
>#	source='src/cmd.cc' object='src/cmd.o' libtool=no 
>In file included from src/file_io.cc:19:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd.o src/cmd.cc
>src/file_io.cc:378:42: warning: unused parameter 'path' [-Wunused-parameter]
> tree_walker::visit_dir(file_path const & path)
>                                          ^
>\
>#	source='src/cmd_netsync.cc' object='src/cmd_netsync.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd_netsync.o src/cmd_netsync.cc
>In file included from src/sanity.cc:27:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/cmd_list.cc' object='src/cmd_list.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd_list.o src/cmd_list.cc
>\
>#	source='src/cmd_packet.cc' object='src/cmd_packet.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd_packet.o src/cmd_packet.cc
>\
>#	source='src/cmd_key_cert.cc' object='src/cmd_key_cert.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd_key_cert.o src/cmd_key_cert.cc
>In file included from src/ui.cc:22:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/cmd_merging.cc' object='src/cmd_merging.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd_merging.o src/cmd_merging.cc
>In file included from src/commands.cc:13:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>src/commands.cc: In function 'commands::command_id commands::complete_command(const args_vector&)':
>src/commands.cc:450:26: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
>     if (CMD_REF(__root__)->find_command(make_command_id(args[0]())) != NULL)
>                          ^
>src/commands.cc:460:57: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
>     command::children_set const & cs = CMD_REF(__root__)->children();
>                                                         ^
>\
>#	source='src/cmd_db.cc' object='src/cmd_db.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd_db.o src/cmd_db.cc
>In file included from src/automate_ostream_demuxed.hh:17:0,
>                 from src/cmd_netsync.cc:15:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/cmd_diff_log.cc' object='src/cmd_diff_log.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd_diff_log.o src/cmd_diff_log.cc
>In file included from src/cmd.cc:22:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>In file included from src/cmd.cc:12:0:
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:60:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(__root__, "__root__", "", NULL, "", "");
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:60:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(__root__, "__root__", "", NULL, "", "");
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:60:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(__root__, "__root__", "", NULL, "", "");
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:253:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, false)
>   ^
>src/cmd.cc:62:1: note: in expansion of macro 'CMD_GROUP_NO_COMPLETE'
> CMD_GROUP_NO_COMPLETE(automation, "automation", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:253:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, false)
>   ^
>src/cmd.cc:62:1: note: in expansion of macro 'CMD_GROUP_NO_COMPLETE'
> CMD_GROUP_NO_COMPLETE(automation, "automation", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:253:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, false)
>   ^
>src/cmd.cc:62:1: note: in expansion of macro 'CMD_GROUP_NO_COMPLETE'
> CMD_GROUP_NO_COMPLETE(automation, "automation", "", CMD_REF(__root__),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:65:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(database, "database", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:65:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(database, "database", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:65:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(database, "database", "", CMD_REF(__root__),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:68:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(debug, "debug", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:68:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(debug, "debug", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:68:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(debug, "debug", "", CMD_REF(__root__),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:71:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(informative, "informative", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:71:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(informative, "informative", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:71:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(informative, "informative", "", CMD_REF(__root__),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:74:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(key_and_cert, "key_and_cert", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:74:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(key_and_cert, "key_and_cert", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:74:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(key_and_cert, "key_and_cert", "", CMD_REF(__root__),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:77:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(network, "network", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:77:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(network, "network", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:77:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(network, "network", "", CMD_REF(__root__),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:80:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(packet_io, "packet_io", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:80:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(packet_io, "packet_io", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:80:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(packet_io, "packet_io", "", CMD_REF(__root__),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:83:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(vcs, "vcs", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:83:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(vcs, "vcs", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:83:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(vcs, "vcs", "", CMD_REF(__root__),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:86:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(review, "review", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:86:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(review, "review", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:86:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(review, "review", "", CMD_REF(__root__),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:89:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(tree, "tree", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:89:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(tree, "tree", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:89:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(tree, "tree", "", CMD_REF(__root__),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:92:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(variables, "variables", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:92:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(variables, "variables", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:92:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(variables, "variables", "", CMD_REF(__root__),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:95:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(workspace, "workspace", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:95:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(workspace, "workspace", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:95:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(workspace, "workspace", "", CMD_REF(__root__),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:98:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(user, "user", "", CMD_REF(__root__),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:98:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(user, "user", "", CMD_REF(__root__),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd.cc:98:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(user, "user", "", CMD_REF(__root__),
> ^
>src/cmd.cc:436:51: warning: unused parameter 'execid' [-Wunused-parameter]
>     void exec(app_state & app, command_id const & execid,
>                                                   ^
>In file included from src/cmd.cc:12:0:
>src/cmd.hh:275:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.cc:507:1: note: in expansion of macro 'CMD_NO_WORKSPACE'
> CMD_NO_WORKSPACE(help, "help", "", CMD_REF(informative),
> ^
>src/cmd.hh:275:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.cc:524:1: note: in expansion of macro 'CMD_NO_WORKSPACE'
> CMD_NO_WORKSPACE(version, "version", "", CMD_REF(informative), "",
> ^
>src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/cmd.cc:538:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(check_glob, "check_glob", "", CMD_REF(debug),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/cmd.cc:538:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(check_glob, "check_glob", "", CMD_REF(debug),
> ^
>src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/cmd.cc:551:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(crash, "crash", "", CMD_REF(debug),
> ^
>src/cmd.hh:275:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.cc:905:1: note: in expansion of macro 'CMD_NO_WORKSPACE'
> CMD_NO_WORKSPACE(manpage, "manpage", "", CMD_REF(informative), "",
> ^
>src/cmd.hh:276:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>src/cmd.cc:905:1: note: in expansion of macro 'CMD_NO_WORKSPACE'
> CMD_NO_WORKSPACE(manpage, "manpage", "", CMD_REF(informative), "",
> ^
>In file included from src/hmac.hh:17:0,
>                 from src/netcmd.hh:23,
>                 from src/netsync.hh:14,
>                 from src/cmd_netsync.cc:18:
>src/string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>In file included from src/cmd_netsync.cc:13:0:
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:308:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, false, false, params, abstract, desc, opts)
>   ^
>src/cmd_netsync.cc:211:1: note: in expansion of macro 'CMD_AUTOMATE_NO_STDIO'
> CMD_AUTOMATE_NO_STDIO(remote,
> ^
>src/cmd_netsync.cc:439:29: warning: unused parameter 'project' [-Wunused-parameter]
>                 project_t & project,
>                             ^
>In file included from src/cmd_netsync.cc:13:0:
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_netsync.cc:540:1: note: in expansion of macro 'CMD'
> CMD(push, "push", "", CMD_REF(network),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_netsync.cc:564:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(push, N_("[URI]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_netsync.cc:589:1: note: in expansion of macro 'CMD'
> CMD(pull, "pull", "", CMD_REF(network),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_netsync.cc:625:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(pull, N_("[URI]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_netsync.cc:650:1: note: in expansion of macro 'CMD'
> CMD(sync, "sync", "", CMD_REF(network),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_netsync.cc:691:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(sync, N_("[URI]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
> ^
>\
>#	source='src/cmd_ws_commit.cc' object='src/cmd_ws_commit.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd_ws_commit.o src/cmd_ws_commit.cc
>\
>#	source='src/cmd_othervcs.cc' object='src/cmd_othervcs.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd_othervcs.o src/cmd_othervcs.cc
>\
>#	source='src/cmd_automate.cc' object='src/cmd_automate.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd_automate.o src/cmd_automate.cc
>\
>#	source='src/cmd_files.cc' object='src/cmd_files.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd_files.o src/cmd_files.cc
>In file included from src/cmd_packet.cc:15:0:
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_packet.cc:67:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(put_public_key, N_("KEY-PACKET-DATA"),
> ^
>src/cmd.hh:302:19: warning: unused parameter 'output' [-Wunused-parameter]
>    std::ostream & output) const
>                   ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_packet.cc:67:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(put_public_key, N_("KEY-PACKET-DATA"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_packet.cc:128:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_public_key, N_("KEY_NAME_OR_HASH"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_packet.cc:248:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(read_packets, N_("PACKET-DATA"),
> ^
>src/cmd.hh:302:19: warning: unused parameter 'output' [-Wunused-parameter]
>    std::ostream & output) const
>                   ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_packet.cc:248:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(read_packets, N_("PACKET-DATA"),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_packet.cc:264:1: note: in expansion of macro 'CMD'
> CMD(read, "read", "", CMD_REF(packet_io), "[FILE1 [FILE2 [...]]]",
> ^
>In file included from src/cmd_list.cc:30:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>In file included from src/cmd_list.cc:22:0:
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_list.cc:51:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(list, "list", "ls", CMD_REF(informative),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_list.cc:51:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(list, "list", "ls", CMD_REF(informative),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_list.cc:51:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(list, "list", "ls", CMD_REF(informative),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_list.cc:499:1: note: in expansion of macro 'CMD'
> CMD(epochs, "epochs", "", CMD_REF(list), "[BRANCH [...]]",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_list.cc:666:1: note: in expansion of macro 'CMD'
> CMD(workspaces, "workspaces", "", CMD_REF(list), "",
> ^
>src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_list.cc:666:1: note: in expansion of macro 'CMD'
> CMD(workspaces, "workspaces", "", CMD_REF(list), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_list.cc:676:1: note: in expansion of macro 'CMD'
> CMD(databases, "databases", "dbs", CMD_REF(list), "",
> ^
>src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_list.cc:676:1: note: in expansion of macro 'CMD'
> CMD(databases, "databases", "dbs", CMD_REF(list), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_list.cc:745:1: note: in expansion of macro 'CMD'
> CMD(known, "known", "", CMD_REF(list), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_list.cc:804:1: note: in expansion of macro 'CMD'
> CMD(unknown, "unknown", "", CMD_REF(list), "[PATH]",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_list.cc:816:1: note: in expansion of macro 'CMD'
> CMD(ignored, "ignored", "", CMD_REF(list), "[PATH]",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_list.cc:828:1: note: in expansion of macro 'CMD'
> CMD(missing, "missing", "", CMD_REF(list), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_list.cc:851:1: note: in expansion of macro 'CMD'
> CMD(changed, "changed", "", CMD_REF(list), "[PATH...]",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_list.cc:956:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(keys, "",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_list.cc:1015:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(certs, N_("REV"),
> ^
>In file included from src/cmd_merging.cc:30:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>In file included from src/cmd_key_cert.cc:17:0:
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_key_cert.cc:72:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(generate_key, N_("KEY_NAME PASSPHRASE"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_key_cert.cc:180:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(drop_public_key, N_("KEY_NAME_OR_HASH"),
> ^
>src/cmd.hh:302:19: warning: unused parameter 'output' [-Wunused-parameter]
>    std::ostream & output) const
>                   ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_key_cert.cc:180:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(drop_public_key, N_("KEY_NAME_OR_HASH"),
> ^
>src/cmd_merging.cc:198:28: warning: unused parameter 'args' [-Wunused-parameter]
>        args_vector const & args)
>                            ^
>In file included from src/cmd_merging.cc:17:0:
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_merging.cc:377:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(update, "",
> ^
>src/cmd.hh:302:19: warning: unused parameter 'output' [-Wunused-parameter]
>    std::ostream & output) const
>                   ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_merging.cc:377:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(update, "",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_merging.cc:1161:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(show_conflicts, N_("[LEFT_REVID RIGHT_REVID]"),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_merging.cc:1178:1: note: in expansion of macro 'CMD'
> CMD(store, "store", "", CMD_REF(conflicts),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_merging.cc:1205:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(file_merge, N_("LEFT_REVID LEFT_FILENAME RIGHT_REVID RIGHT_FILENAME"),
> ^
>\
>#	source='src/cmd_conflicts.cc' object='src/cmd_conflicts.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cmd_conflicts.o src/cmd_conflicts.cc
>In file included from src/cmd_othervcs.cc:12:0:
>src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_othervcs.cc:28:1: note: in expansion of macro 'CMD'
> CMD(rcs_import, "rcs_import", "", CMD_REF(debug), N_("RCSFILE..."),
> ^
>In file included from src/cmd_automate.cc:17:0:
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_automate.cc:40:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(automate, "automate", "au", CMD_REF(automation),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_automate.cc:40:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(automate, "automate", "au", CMD_REF(automation),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_automate.cc:40:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(automate, "automate", "au", CMD_REF(automation),
> ^
>src/cmd.hh:299:16: warning: unused parameter 'app' [-Wunused-parameter]
>   (app_state & app,                                                          \
>                ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_automate.cc:107:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(interface_version, "",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_automate.cc:107:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(interface_version, "",
> ^
>In file included from src/cmd_db.cc:16:0:
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_db.cc:40:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(db, "db", "", CMD_REF(database),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_db.cc:40:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(db, "db", "", CMD_REF(database),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_db.cc:40:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(db, "db", "", CMD_REF(database),
> ^
>src/cmd.hh:299:16: warning: unused parameter 'app' [-Wunused-parameter]
>   (app_state & app,                                                          \
>                ^
>src/cmd.hh:311:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, true, params, abstract, desc, opts)
>   ^
>src/cmd_automate.cc:131:1: note: in expansion of macro 'CMD_AUTOMATE_HIDDEN'
> CMD_AUTOMATE_HIDDEN(bandtest, "{ info | warning | error | ticker }",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:311:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, true, params, abstract, desc, opts)
>   ^
>src/cmd_automate.cc:131:1: note: in expansion of macro 'CMD_AUTOMATE_HIDDEN'
> CMD_AUTOMATE_HIDDEN(bandtest, "{ info | warning | error | ticker }",
> ^
>src/cmd.hh:302:19: warning: unused parameter 'output' [-Wunused-parameter]
>    std::ostream & output) const
>                   ^
>src/cmd.hh:311:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, true, params, abstract, desc, opts)
>   ^
>src/cmd_automate.cc:131:1: note: in expansion of macro 'CMD_AUTOMATE_HIDDEN'
> CMD_AUTOMATE_HIDDEN(bandtest, "{ info | warning | error | ticker }",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:44:1: note: in expansion of macro 'CMD'
> CMD(db_init, "init", "", CMD_REF(db), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:56:1: note: in expansion of macro 'CMD'
> CMD(db_info, "info", "", CMD_REF(db), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:68:1: note: in expansion of macro 'CMD'
> CMD(db_version, "version", "", CMD_REF(db), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:80:1: note: in expansion of macro 'CMD'
> CMD(db_fix_certs, "fix_certs", "", CMD_REF(db), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:97:1: note: in expansion of macro 'CMD'
> CMD(db_dump, "dump", "", CMD_REF(db), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:111:1: note: in expansion of macro 'CMD'
> CMD(db_load, "load", "", CMD_REF(db), "",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:308:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, false, false, params, abstract, desc, opts)
>   ^
>src/cmd_automate.cc:229:1: note: in expansion of macro 'CMD_AUTOMATE_NO_STDIO'
> CMD_AUTOMATE_NO_STDIO(stdio, "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:125:1: note: in expansion of macro 'CMD'
> CMD(db_migrate, "migrate", "", CMD_REF(db), "",
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_db.cc:171:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(db_local, "local", "", CMD_REF(database),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_db.cc:171:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(db_local, "local", "", CMD_REF(database),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_db.cc:171:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(db_local, "local", "", CMD_REF(database),
> ^
>In file included from src/cmd_ws_commit.cc:33:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:318:1: note: in expansion of macro 'CMD'
> CMD(db_check, "check", "", CMD_REF(db), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:331:1: note: in expansion of macro 'CMD'
> CMD(db_changesetify, "changesetify", "", CMD_REF(db), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:352:1: note: in expansion of macro 'CMD'
> CMD(db_rosterify, "rosterify", "", CMD_REF(db), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:374:1: note: in expansion of macro 'CMD'
> CMD(db_regenerate_caches, "regenerate_caches", "", CMD_REF(db), "",
> ^
>In file included from src/cmd_diff_log.cc:28:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:629:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(load_revisions, "load_revisions", "", CMD_REF(db), "",
> ^
>src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:629:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(load_revisions, "load_revisions", "", CMD_REF(db), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:658:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(load_rosters, "load_rosters", "", CMD_REF(db), "",
> ^
>src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:658:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(load_rosters, "load_rosters", "", CMD_REF(db), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:686:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(load_files, "load_files", "", CMD_REF(db), "",
> ^
>src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:686:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(load_files, "load_files", "", CMD_REF(db), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:712:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(load_certs, "load_certs", "", CMD_REF(db), "",
> ^
>src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/cmd_db.cc:712:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(load_certs, "load_certs", "", CMD_REF(db), "",
> ^
>src/cmd_ws_commit.cc:170:49: warning: unused parameter 'rid' [-Wunused-parameter]
>                               revision_id const rid, revision_t const & rev,
>                                                 ^
>In file included from src/cmd_ws_commit.cc:17:0:
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_ws_commit.cc:538:1: note: in expansion of macro 'CMD'
> CMD(revert, "revert", "", CMD_REF(workspace), N_("[PATH]..."),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_ws_commit.cc:547:1: note: in expansion of macro 'CMD'
> CMD(undrop, "undrop", "", CMD_REF(workspace), N_("PATH..."),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_ws_commit.cc:890:1: note: in expansion of macro 'CMD'
> CMD(status, "status", "", CMD_REF(informative), N_("[PATH]..."),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_ws_commit.cc:1125:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(checkout, N_("[DIRECTORY]"),
> ^
>src/cmd.hh:302:19: warning: unused parameter 'output' [-Wunused-parameter]
>    std::ostream & output) const
>                   ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_ws_commit.cc:1125:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(checkout, N_("[DIRECTORY]"),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_ws_commit.cc:1142:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(attr, "attr", "", CMD_REF(workspace),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_ws_commit.cc:1142:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(attr, "attr", "", CMD_REF(workspace),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_ws_commit.cc:1142:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(attr, "attr", "", CMD_REF(workspace),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_ws_commit.cc:1336:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_attributes, N_("PATH"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_ws_commit.cc:1450:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(set_attribute, N_("PATH KEY VALUE"),
> ^
>src/cmd.hh:302:19: warning: unused parameter 'output' [-Wunused-parameter]
>    std::ostream & output) const
>                   ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_ws_commit.cc:1450:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(set_attribute, N_("PATH KEY VALUE"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_ws_commit.cc:1472:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(drop_attribute, N_("PATH [KEY]"),
> ^
>src/cmd.hh:302:19: warning: unused parameter 'output' [-Wunused-parameter]
>    std::ostream & output) const
>                   ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_ws_commit.cc:1472:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(drop_attribute, N_("PATH [KEY]"),
> ^
>src/cmd.hh:275:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd_ws_commit.cc:1868:1: note: in expansion of macro 'CMD_NO_WORKSPACE'
> CMD_NO_WORKSPACE(import, "import", "", CMD_REF(tree), N_("DIRECTORY"),
> ^
>In file included from src/cmd_diff_log.cc:19:0:
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_diff_log.cc:416:1: note: in expansion of macro 'CMD'
> CMD(diff, "diff", "di", CMD_REF(informative), N_("[PATH]..."),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_ws_commit.cc:2003:1: note: in expansion of macro 'CMD'
> CMD(refresh_inodeprints, "refresh_inodeprints", "", CMD_REF(tree), "",
> ^
>src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_ws_commit.cc:2003:1: note: in expansion of macro 'CMD'
> CMD(refresh_inodeprints, "refresh_inodeprints", "", CMD_REF(tree), "",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_diff_log.cc:462:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(content_diff, N_("[FILE [...]]"),
> ^
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_ws_commit.cc:2014:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(bisect, "bisect", "", CMD_REF(informative),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_ws_commit.cc:2014:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(bisect, "bisect", "", CMD_REF(informative),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_ws_commit.cc:2014:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(bisect, "bisect", "", CMD_REF(informative),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_diff_log.cc:980:1: note: in expansion of macro 'CMD'
> CMD(log, "log", "", CMD_REF(informative), N_("[PATH] ..."),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_diff_log.cc:994:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(log, N_("[PATH] ..."),
> ^
>\
>#	source='src/diff_output.cc' object='src/diff_output.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/diff_output.o src/diff_output.cc
>In file included from src/cmd_files.cc:20:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/lua_hooks.cc' object='src/lua_hooks.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/lua_hooks.o src/lua_hooks.cc
>In file included from src/cmd_files.cc:16:0:
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_files.cc:38:1: note: in expansion of macro 'CMD'
> CMD(fload, "fload", "", CMD_REF(debug), "",
> ^
>src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_files.cc:38:1: note: in expansion of macro 'CMD'
> CMD(fload, "fload", "", CMD_REF(debug), "",
> ^
>src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_files.cc:202:1: note: in expansion of macro 'CMD'
> CMD(identify, "identify", "", CMD_REF(debug), N_("[PATH]"),
> ^
>src/cmd.hh:299:16: warning: unused parameter 'app' [-Wunused-parameter]
>   (app_state & app,                                                          \
>                ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_files.cc:233:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(identify, N_("PATH"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_files.cc:233:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(identify, N_("PATH"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_files.cc:330:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_file, N_("FILEID"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_files.cc:354:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_file_size, N_("FILEID"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/cmd_files.cc:388:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_file_of, N_("FILENAME"),
> ^
>In file included from src/diff_output.cc:17:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/transforms.cc' object='src/transforms.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/transforms.o src/transforms.cc
>In file included from src/cmd_conflicts.cc:14:0:
>src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_conflicts.cc:18:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(conflicts, "conflicts", "", CMD_REF(tree),
> ^
>src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_conflicts.cc:18:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(conflicts, "conflicts", "", CMD_REF(tree),
> ^
>src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>src/cmd_conflicts.cc:18:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(conflicts, "conflicts", "", CMD_REF(tree),
> ^
>\
>#	source='src/update.cc' object='src/update.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/update.o src/update.cc
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_conflicts.cc:448:1: note: in expansion of macro 'CMD'
> CMD(show_first, "show_first", "", CMD_REF(conflicts),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_conflicts.cc:461:1: note: in expansion of macro 'CMD'
> CMD(show_remaining, "show_remaining", "", CMD_REF(conflicts),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_conflicts.cc:474:1: note: in expansion of macro 'CMD'
> CMD(resolve_first, "resolve_first", "", CMD_REF(conflicts),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_conflicts.cc:488:1: note: in expansion of macro 'CMD'
> CMD(resolve_first_left, "resolve_first_left", "", CMD_REF(conflicts),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_conflicts.cc:502:1: note: in expansion of macro 'CMD'
> CMD(resolve_first_right, "resolve_first_right", "", CMD_REF(conflicts),
> ^
>src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_conflicts.cc:516:1: note: in expansion of macro 'CMD'
> CMD(clean, "clean", "", CMD_REF(conflicts),
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_conflicts.cc:516:1: note: in expansion of macro 'CMD'
> CMD(clean, "clean", "", CMD_REF(conflicts),
> ^
>src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/cmd_conflicts.cc:516:1: note: in expansion of macro 'CMD'
> CMD(clean, "clean", "", CMD_REF(conflicts),
> ^
>\
>#	source='src/work.cc' object='src/work.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/work.o src/work.cc
>\
>#	source='src/migrate_work.cc' object='src/migrate_work.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/migrate_work.o src/migrate_work.cc
>\
>#	source='src/cert.cc' object='src/cert.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cert.o src/cert.cc
>src/transforms.cc:123:58: warning: unused parameter 'made_from' [-Wunused-parameter]
>                                             origin::type made_from)
>                                                          ^
>In file included from src/lua_hooks.cc:33:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>src/lua_hooks.cc:41:38: warning: unused parameter 'st' [-Wunused-parameter]
> static int panic_thrower(lua_State * st)
>                                      ^
>\
>#	source='src/project.cc' object='src/project.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/project.o src/project.cc
>\
>#	source='src/outdated_indicator.cc' object='src/outdated_indicator.o' libtool=no 
>\
>#	source='src/database.cc' object='src/database.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/outdated_indicator.o src/outdated_indicator.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/database.o src/database.cc
>In file included from src/migrate_work.cc:13:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/key_store.cc' object='src/key_store.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/key_store.o src/key_store.cc
>src/update.cc:83:43: warning: unused parameter 'base' [-Wunused-parameter]
>                       revision_id const & base,
>                                           ^
>\
>#	source='src/ssh_agent.cc' object='src/ssh_agent.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/ssh_agent.o src/ssh_agent.cc
>\
>#	source='src/keys.cc' object='src/keys.o' libtool=no 
>src/work.cc:1546:55: warning: unused parameter 'path' [-Wunused-parameter]
> simulated_working_tree::apply_delta(file_path const & path,
>                                                       ^
>src/work.cc:1547:53: warning: unused parameter 'old_id' [-Wunused-parameter]
>                                     file_id const & old_id,
>                                                     ^
>src/work.cc:1548:53: warning: unused parameter 'new_id' [-Wunused-parameter]
>                                     file_id const & new_id)
>                                                     ^
>src/work.cc:1555:54: warning: unused parameter 'path' [-Wunused-parameter]
> simulated_working_tree::clear_attr(file_path const & path,
>                                                      ^
>src/work.cc:1556:53: warning: unused parameter 'key' [-Wunused-parameter]
>                                    attr_key const & key)
>                                                     ^
>src/work.cc:1561:52: warning: unused parameter 'path' [-Wunused-parameter]
> simulated_working_tree::set_attr(file_path const & path,
>                                                    ^
>src/work.cc:1562:51: warning: unused parameter 'key' [-Wunused-parameter]
>                                  attr_key const & key,
>                                                   ^
>src/work.cc:1563:53: warning: unused parameter 'val' [-Wunused-parameter]
>                                  attr_value const & val)
>                                                     ^
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/keys.o src/keys.cc
>In file included from src/netio.hh:20:0,
>                 from src/cert.cc:14:
>src/string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>In file included from src/cert.cc:15:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/packet.cc' object='src/packet.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/packet.o src/packet.cc
>\
>#	source='src/key_packet.cc' object='src/key_packet.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/key_packet.o src/key_packet.cc
>In file included from src/netio.hh:20:0,
>                 from src/ssh_agent.cc:20:
>src/string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>In file included from src/project.cc:24:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>In file included from src/database.cc:52:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>In file included from src/packet.cc:21:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/rcs_file.cc' object='src/rcs_file.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/rcs_file.o src/rcs_file.cc
>\
>#	source='src/xdelta.cc' object='src/xdelta.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/xdelta.o src/xdelta.cc
>\
>#	source='src/migrate_schema.cc' object='src/migrate_schema.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/migrate_schema.o src/migrate_schema.cc
>In file included from src/keys.cc:18:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>src/database.cc:785:54: warning: unused parameter 'cols' [-Wunused-parameter]
> dump_table_cb(void *data, int n, char **vals, char **cols)
>                                                      ^
>src/database.cc:819:54: warning: unused parameter 'cols' [-Wunused-parameter]
> dump_index_cb(void *data, int n, char **vals, char **cols)
>                                                      ^
>src/database.cc:835:61: warning: unused parameter 'cols' [-Wunused-parameter]
> dump_user_version_cb(void *data, int n, char **vals, char **cols)
>                                                             ^
>src/key_store.cc:133:52: warning: unused parameter 'ident' [-Wunused-parameter]
>     virtual void consume_file_data(file_id const & ident,
>                                                    ^
>src/key_store.cc:134:54: warning: unused parameter 'dat' [-Wunused-parameter]
>                                    file_data const & dat)
>                                                      ^
>src/key_store.cc:136:53: warning: unused parameter 'id_old' [-Wunused-parameter]
>     virtual void consume_file_delta(file_id const & id_old,
>                                                     ^
>src/key_store.cc:137:53: warning: unused parameter 'id_new' [-Wunused-parameter]
>                                     file_id const & id_new,
>                                                     ^
>src/key_store.cc:138:56: warning: unused parameter 'del' [-Wunused-parameter]
>                                     file_delta const & del)
>                                                        ^
>src/key_store.cc:141:60: warning: unused parameter 'ident' [-Wunused-parameter]
>     virtual void consume_revision_data(revision_id const & ident,
>                                                            ^
>src/key_store.cc:142:62: warning: unused parameter 'dat' [-Wunused-parameter]
>                                        revision_data const & dat)
>                                                              ^
>src/key_store.cc:144:53: warning: unused parameter 't' [-Wunused-parameter]
>     virtual void consume_revision_cert(cert const & t)
>                                                     ^
>src/key_store.cc:148:54: warning: unused parameter 'ident' [-Wunused-parameter]
>     virtual void consume_public_key(key_name const & ident,
>                                                      ^
>src/key_store.cc:149:57: warning: unused parameter 'k' [-Wunused-parameter]
>                                     rsa_pub_key const & k)
>                                                         ^
>src/key_store.cc:421:50: warning: unused parameter 'ident' [-Wunused-parameter]
>   virtual void consume_file_data(file_id const & ident,
>                                                  ^
>src/key_store.cc:422:52: warning: unused parameter 'dat' [-Wunused-parameter]
>                                  file_data const & dat)
>                                                    ^
>src/key_store.cc:424:51: warning: unused parameter 'id_old' [-Wunused-parameter]
>   virtual void consume_file_delta(file_id const & id_old,
>                                                   ^
>src/key_store.cc:425:51: warning: unused parameter 'id_new' [-Wunused-parameter]
>                                   file_id const & id_new,
>                                                   ^
>src/key_store.cc:426:54: warning: unused parameter 'del' [-Wunused-parameter]
>                                   file_delta const & del)
>                                                      ^
>src/key_store.cc:428:58: warning: unused parameter 'ident' [-Wunused-parameter]
>   virtual void consume_revision_data(revision_id const & ident,
>                                                          ^
>src/key_store.cc:429:60: warning: unused parameter 'dat' [-Wunused-parameter]
>                                      revision_data const & dat)
>                                                            ^
>src/key_store.cc:431:51: warning: unused parameter 't' [-Wunused-parameter]
>   virtual void consume_revision_cert(cert const & t)
>                                                   ^
>src/key_store.cc:433:52: warning: unused parameter 'ident' [-Wunused-parameter]
>   virtual void consume_public_key(key_name const & ident,
>                                                    ^
>src/key_store.cc:434:55: warning: unused parameter 'k' [-Wunused-parameter]
>                                   rsa_pub_key const & k)
>                                                       ^
>src/key_store.cc:446:57: warning: unused parameter 'ident' [-Wunused-parameter]
>   virtual void consume_old_private_key(key_name const & ident,
>                                                         ^
>src/key_store.cc:447:70: warning: unused parameter 'k' [-Wunused-parameter]
>                                        old_arc4_rsa_priv_key const & k)
>                                                                      ^
>src/database.cc:2156:40: warning: unused parameter 'roster' [-Wunused-parameter]
>   void look_at_roster(roster_t const & roster, marking_map const & mm)
>                                        ^
>src/database.cc:2177:68: warning: unused parameter 'mm' [-Wunused-parameter]
>   void look_at_roster(roster_t const & roster, marking_map const & mm)
>                                                                    ^
>In file included from src/key_packet.cc:25:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/migrate_ancestry.cc' object='src/migrate_ancestry.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/migrate_ancestry.o src/migrate_ancestry.cc
>src/database.cc:4773:49: warning: unused parameter 'rev' [-Wunused-parameter]
>   virtual void get_children(revision_id const & rev, set<revision_id> & parents) const
>                                                 ^
>src/database.cc:4773:73: warning: unused parameter 'parents' [-Wunused-parameter]
>   virtual void get_children(revision_id const & rev, set<revision_id> & parents) const
>                                                                         ^
>src/xdelta.cc:745:37: warning: unused parameter 'base' [-Wunused-parameter]
>   virtual void begin(string const & base) {}
>                                     ^
>\
>#	source='src/refiner.cc' object='src/refiner.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/refiner.o src/refiner.cc
>\
>#	source='src/enumerator.cc' object='src/enumerator.o' libtool=no 
>\
>#	source='src/netsync.cc' object='src/netsync.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/enumerator.o src/enumerator.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netsync.o src/netsync.cc
>\
>#	source='src/network/automate_session.cc' object='src/network/automate_session.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/network/automate_session.o src/network/automate_session.cc
>In file included from src/hmac.hh:17:0,
>                 from src/netcmd.hh:23,
>                 from src/refiner.hh:17,
>                 from src/refiner.cc:17:
>src/string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>src/migrate_schema.cc:786:57: warning: unused parameter 'keys' [-Wunused-parameter]
> migrate_add_branch_leaf_cache(sqlite3 * db, key_store & keys)
>                                                         ^
>\
>#	source='src/network/connection_info.cc' object='src/network/connection_info.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/network/connection_info.o src/network/connection_info.cc
>\
>#	source='src/network/listener_base.cc' object='src/network/listener_base.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/network/listener_base.o src/network/listener_base.cc
>src/network/listener_base.cc:28:38: warning: unused parameter 'now' [-Wunused-parameter]
> bool listener_base::timed_out(time_t now) { return false; }
>                                      ^
>src/network/listener_base.cc:29:49: warning: unused parameter 'guard' [-Wunused-parameter]
> bool listener_base::do_work(transaction_guard & guard) { return true; }
>                                                 ^
>In file included from src/hmac.hh:17:0,
>                 from src/netcmd.hh:23,
>                 from src/netsync.hh:14,
>                 from src/netsync.cc:12:
>src/string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>\
>#	source='src/network/listener.cc' object='src/network/listener.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/network/listener.o src/network/listener.cc
>In file included from src/migrate_ancestry.cc:23:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/network/make_server.cc' object='src/network/make_server.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/network/make_server.o src/network/make_server.cc
>In file included from src/network/automate_session.cc:14:0:
>src/network/../simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/network/../simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/network/netsync_session.cc' object='src/network/netsync_session.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/network/netsync_session.o src/network/netsync_session.cc
>\
>#	source='src/network/reactable.cc' object='src/network/reactable.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/network/reactable.o src/network/reactable.cc
>In file included from src/network/automate_session.hh:16:0,
>                 from src/netsync.cc:22:
>src/network/wrapped_session.hh:74:34: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_in(int count) { return; }
>                                  ^
>src/network/wrapped_session.hh:75:35: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_out(int count) { return; }
>                                   ^
>In file included from src/network/../hmac.hh:17:0,
>                 from src/network/../netcmd.hh:23,
>                 from src/network/wrapped_session.hh:13,
>                 from src/network/automate_session.hh:16,
>                 from src/network/automate_session.cc:18:
>src/network/../string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>In file included from src/network/automate_session.hh:16:0,
>                 from src/network/automate_session.cc:18:
>src/network/wrapped_session.hh:74:34: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_in(int count) { return; }
>                                  ^
>src/network/wrapped_session.hh:75:35: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_out(int count) { return; }
>                                   ^
>src/network/automate_session.cc:93:48: warning: unused parameter 'use_transport_auth' [-Wunused-parameter]
>                                           bool use_transport_auth)
>                                                ^
>src/network/automate_session.cc:142:52: warning: unused parameter 'guard' [-Wunused-parameter]
> bool automate_session::do_work(transaction_guard & guard,
>                                                    ^
>In file included from src/network/session.hh:13:0,
>                 from src/netsync.cc:27:
>src/network/session_base.hh:33:34: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_in(int count) { return; }
>                                  ^
>src/network/session_base.hh:34:35: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_out(int count) { return; }
>                                   ^
>src/netsync.cc:66:34: warning: unused parameter 'opts' [-Wunused-parameter]
> build_stream_to_server(options & opts, lua_hooks & lua,
>                                  ^
>src/netsync.cc:66:52: warning: unused parameter 'lua' [-Wunused-parameter]
> build_stream_to_server(options & opts, lua_hooks & lua,
>                                                    ^
>src/netsync.cc:272:29: warning: unused parameter 'opts' [-Wunused-parameter]
>                   options & opts,
>                             ^
>src/netsync.cc:273:31: warning: unused parameter 'lua' [-Wunused-parameter]
>                   lua_hooks & lua,
>                               ^
>\
>#	source='src/network/reactor.cc' object='src/network/reactor.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/network/reactor.o src/network/reactor.cc
>\
>#	source='src/network/session.cc' object='src/network/session.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/network/session.o src/network/session.cc
>\
>#	source='src/network/session_base.cc' object='src/network/session_base.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/network/session_base.o src/network/session_base.cc
>\
>#	source='src/network/wrapped_session.cc' object='src/network/wrapped_session.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/network/wrapped_session.o src/network/wrapped_session.cc
>In file included from src/network/../hmac.hh:17:0,
>                 from src/network/../netcmd.hh:23,
>                 from src/network/../netsync.hh:14,
>                 from src/network/connection_info.cc:20:
>src/network/../string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>In file included from src/network/../hmac.hh:17:0,
>                 from src/network/../netcmd.hh:23,
>                 from src/network/session_base.hh:19,
>                 from src/network/session_base.cc:12:
>src/network/../string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>In file included from src/network/session_base.cc:12:0:
>src/network/session_base.hh:33:34: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_in(int count) { return; }
>                                  ^
>src/network/session_base.hh:34:35: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_out(int count) { return; }
>                                   ^
>In file included from src/network/../hmac.hh:17:0,
>                 from src/network/../netcmd.hh:23,
>                 from src/network/listener.hh:14,
>                 from src/network/listener.cc:17:
>src/network/../string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>\
>#	source='src/netxx_pipe.cc' object='src/netxx_pipe.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netxx_pipe.o src/netxx_pipe.cc
>In file included from src/network/../hmac.hh:17:0,
>                 from src/network/../netcmd.hh:23,
>                 from src/network/netsync_session.hh:21,
>                 from src/network/netsync_session.cc:12:
>src/network/../string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>\
>#	source='src/netcmd.cc' object='src/netcmd.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/netcmd.o src/netcmd.cc
>In file included from src/network/netsync_session.hh:25:0,
>                 from src/network/listener.cc:19:
>src/network/wrapped_session.hh:74:34: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_in(int count) { return; }
>                                  ^
>src/network/wrapped_session.hh:75:35: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_out(int count) { return; }
>                                   ^
>In file included from src/network/session.hh:13:0,
>                 from src/network/listener.cc:21:
>src/network/session_base.hh:33:34: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_in(int count) { return; }
>                                  ^
>src/network/session_base.hh:34:35: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_out(int count) { return; }
>                                   ^
>src/network/listener.cc:49:42: warning: unused parameter 'event' [-Wunused-parameter]
> listener::do_io(Netxx::Probe::ready_type event)
>                                          ^
>In file included from src/network/netsync_session.hh:25:0,
>                 from src/network/netsync_session.cc:12:
>src/network/wrapped_session.hh:74:34: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_in(int count) { return; }
>                                  ^
>src/network/wrapped_session.hh:75:35: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_out(int count) { return; }
>                                   ^
>In file included from src/network/../hmac.hh:17:0,
>                 from src/network/../netcmd.hh:23,
>                 from src/network/wrapped_session.hh:13,
>                 from src/network/wrapped_session.cc:11:
>src/network/../string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>In file included from src/network/wrapped_session.cc:11:0:
>src/network/wrapped_session.hh:74:34: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_in(int count) { return; }
>                                  ^
>src/network/wrapped_session.hh:75:35: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_out(int count) { return; }
>                                   ^
>src/network/netsync_session.cc:525:68: warning: unused parameter 'ident' [-Wunused-parameter]
> netsync_session::note_item_arrived(netcmd_item_type ty, id const & ident)
>                                                                    ^
>In file included from src/network/session.hh:13:0,
>                 from src/network/wrapped_session.cc:13:
>src/network/session_base.hh:33:34: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_in(int count) { return; }
>                                  ^
>src/network/session_base.hh:34:35: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_out(int count) { return; }
>                                   ^
>src/network/wrapped_session.cc:91:39: warning: unused parameter 'ident' [-Wunused-parameter]
> void wrapped_session::on_begin(size_t ident, key_identity_info const & remote_key)
>                                       ^
>src/network/wrapped_session.cc:91:72: warning: unused parameter 'remote_key' [-Wunused-parameter]
> void wrapped_session::on_begin(size_t ident, key_identity_info const & remote_key)
>                                                                        ^
>src/network/wrapped_session.cc:94:37: warning: unused parameter 'ident' [-Wunused-parameter]
> void wrapped_session::on_end(size_t ident)
>                                     ^
>src/network/netsync_session.cc:1136:55: warning: unused parameter 'guard' [-Wunused-parameter]
>                                   transaction_guard & guard)
>                                                       ^
>\
>#	source='src/merkle_tree.cc' object='src/merkle_tree.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/merkle_tree.o src/merkle_tree.cc
>\
>#	source='src/lcs.cc' object='src/lcs.o' libtool=no 
>\
>#	source='src/rcs_import.cc' object='src/rcs_import.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/lcs.o src/lcs.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/rcs_import.o src/rcs_import.cc
>\
>#	source='src/git_change.cc' object='src/git_change.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/git_change.o src/git_change.cc
>\
>#	source='src/git_export.cc' object='src/git_export.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/git_export.o src/git_export.cc
>In file included from src/hmac.hh:17:0,
>                 from src/netcmd.hh:23,
>                 from src/netcmd.cc:15:
>src/string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>src/lcs.cc: In instantiation of 'void _edit_script(A, A, B, B, std::vector<long int, std::allocator<long int> >&, LCS) [with A = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; B = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; LCS = std::back_insert_iterator<std::vector<long int, std::allocator<long int> > >]':
>src/lcs.cc:700:34:   required from here
>src/lcs.cc:618:23: warning: unused parameter 'ignored_out' [-Wunused-parameter]
>                   LCS ignored_out)
>                       ^
>src/lcs.cc: In instantiation of 'static void jaffer_edit_calculator<A, B, LCS>::order_edits(const edit_vec&, long int, jaffer_edit_calculator<A, B, LCS>::edit_vec&) [with A = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; B = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; LCS = std::back_insert_iterator<std::vector<long int, std::allocator<long int> > >; jaffer_edit_calculator<A, B, LCS>::edit_vec = std::vector<long int, std::allocator<long int> >]':
>src/lcs.cc:665:45:   required from 'void _longest_common_subsequence(A, A, B, B, LCS) [with A = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; B = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; LCS = std::back_insert_iterator<std::vector<long int, std::allocator<long int> > >]'
>src/lcs.cc:686:34:   required from here
>src/lcs.cc:373:32: warning: unused parameter 'sign' [-Wunused-parameter]
>                           long sign,
>                                ^
>src/lcs.cc: In instantiation of 'static long int jaffer_edit_calculator<A, B, LCS>::mid_split(long int, long int, const cost_vec&, const cost_vec&, long int) [with A = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; B = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; LCS = std::back_insert_iterator<std::vector<long int, std::allocator<long int> > >; jaffer_edit_calculator<A, B, LCS>::cost_vec = std::vector<long int, std::allocator<long int> >]':
>src/lcs.cc:326:56:   required from 'static long int jaffer_edit_calculator<A, B, LCS>::divide_and_conquer(const jaffer_edit_calculator<A, B, LCS>::subarray<A>&, long int, long int, const jaffer_edit_calculator<A, B, LCS>::subarray<B>&, long int, long int, jaffer_edit_calculator<A, B, LCS>::edit_vec&, long unsigned int, long int, long int) [with A = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; B = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; LCS = std::back_insert_iterator<std::vector<long int, std::allocator<long int> > >; jaffer_edit_calculator<A, B, LCS>::edit_vec = std::vector<long int, std::allocator<long int> >]'
>src/lcs.cc:566:64:   required from 'static long int jaffer_edit_calculator<A, B, LCS>::diff_to_ez(const jaffer_edit_calculator<A, B, LCS>::subarray<A>&, long int, long int, const jaffer_edit_calculator<A, B, LCS>::subarray<B>&, long int, long int, std::vector<long int, std::allocator<long int> >&, long int, long int, long int) [with A = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; B = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; LCS = std::back_insert_iterator<std::vector<long int, std::allocator<long int> > >]'
>src/lcs.cc:479:62:   required from 'static long int jaffer_edit_calculator<A, B, LCS>::diff_to_et(const jaffer_edit_calculator<A, B, LCS>::subarray<A>&, long int, long int, const jaffer_edit_calculator<A, B, LCS>::subarray<B>&, long int, long int, std::vector<long int, std::allocator<long int> >&, long int, long int, long int) [with A = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; B = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; LCS = std::back_insert_iterator<std::vector<long int, std::allocator<long int> > >]'
>src/lcs.cc:582:78:   required from 'static void jaffer_edit_calculator<A, B, LCS>::diff_to_edits(const jaffer_edit_calculator<A, B, LCS>::subarray<A>&, long int, const jaffer_edit_calculator<A, B, LCS>::subarray<B>&, long int, std::vector<long int, std::allocator<long int> >&) [with A = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; B = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; LCS = std::back_insert_iterator<std::vector<long int, std::allocator<long int> > >]'
>src/lcs.cc:664:54:   required from 'void _longest_common_subsequence(A, A, B, B, LCS) [with A = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; B = __gnu_cxx::__normal_iterator<const long int*, std::vector<long int, std::allocator<long int> > >; LCS = std::back_insert_iterator<std::vector<long int, std::allocator<long int> > >]'
>src/lcs.cc:686:34:   required from here
>src/lcs.cc:351:30: warning: unused parameter 'm' [-Wunused-parameter]
>   static long mid_split(long m, long n,
>                              ^
>In file included from src/netio.hh:20:0,
>                 from src/merkle_tree.cc:20:
>src/string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>In file included from src/network/../hmac.hh:17:0,
>                 from src/network/../netcmd.hh:23,
>                 from src/network/wrapped_session.hh:13,
>                 from src/network/automate_session.hh:16,
>                 from src/network/session.cc:17:
>src/network/../string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>In file included from src/network/automate_session.hh:16:0,
>                 from src/network/session.cc:17:
>src/network/wrapped_session.hh:74:34: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_in(int count) { return; }
>                                  ^
>src/network/wrapped_session.hh:75:35: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_out(int count) { return; }
>                                   ^
>In file included from src/network/session.hh:13:0,
>                 from src/network/session.cc:22:
>src/network/session_base.hh:33:34: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_in(int count) { return; }
>                                  ^
>src/network/session_base.hh:34:35: warning: unused parameter 'count' [-Wunused-parameter]
>   virtual void note_bytes_out(int count) { return; }
>                                   ^
>\
>#	source='src/revision.cc' object='src/revision.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/revision.o src/revision.cc
>\
>#	source='src/ancestry.cc' object='src/ancestry.o' libtool=no 
>\
>#	source='src/cset.cc' object='src/cset.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/ancestry.o src/ancestry.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/cset.o src/cset.cc
>\
>#	source='src/roster.cc' object='src/roster.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/roster.o src/roster.cc
>\
>#	source='src/mt_version.cc' object='src/mt_version.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/mt_version.o src/mt_version.cc
>\
>#	source='src/automate.cc' object='src/automate.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/automate.o src/automate.cc
>In file included from src/git_export.cc:22:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>src/rcs_import.cc:755:43: warning: unused parameter 'ident' [-Wunused-parameter]
>                           file_id const & ident)
>                                           ^
>src/ancestry.cc:364:49: warning: unused parameter 'rid' [-Wunused-parameter]
>     virtual bool operator()(revision_id const & rid)
>                                                 ^
>\
>#	source='src/database_check.cc' object='src/database_check.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/database_check.o src/database_check.cc
>\
>#	source='src/epoch.cc' object='src/epoch.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/epoch.o src/epoch.cc
>\
>#	source='src/gzip.cc' object='src/gzip.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/gzip.o src/gzip.cc
>\
>#	source='src/inodeprint.cc' object='src/inodeprint.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/inodeprint.o src/inodeprint.cc
>In file included from src/netio.hh:20:0,
>                 from src/epoch.cc:12:
>src/string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>In file included from src/roster.cc:25:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>src/roster.cc:2191:47: warning: unused parameter 'n' [-Wunused-parameter]
>                           node_id nid, node_t n,
>                                               ^
>\
>#	source='src/selectors.cc' object='src/selectors.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/selectors.o src/selectors.cc
>\
>#	source='src/annotate.cc' object='src/annotate.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/annotate.o src/annotate.cc
>\
>#	source='src/restrictions.cc' object='src/restrictions.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/restrictions.o src/restrictions.cc
>In file included from src/automate.cc:41:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>In file included from src/automate.cc:28:0:
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:79:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(heads, N_("[BRANCH]"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:116:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(ancestors, N_("REV1 [REV2 [REV3 [...]]]"),
> ^
>\
>#	source='src/hmac.cc' object='src/hmac.o' libtool=no 
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:169:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(descendents, N_("REV1 [REV2 [REV3 [...]]]"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:223:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(erase_ancestors, N_("[REV1 [REV2 [REV3 [...]]]]"),
> ^
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/hmac.o src/hmac.cc
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:253:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(toposort, N_("[REV1 [REV2 [REV3 [...]]]]"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:291:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(ancestry_difference, N_("NEW_REV [OLD_REV1 [OLD_REV2 [...]]]"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:338:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(leaves, "",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:364:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(roots, "",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:394:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(parents, N_("REV"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:425:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(children, N_("REV"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:466:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(graph, "",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:514:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(select, N_("SELECTOR"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1019:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(inventory,  N_("[PATH]..."),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1240:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_revision, N_("REVID"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1314:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_base_revision_id, "",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1342:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_current_revision_id, "",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1411:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_manifest_of, N_("[REVID]"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1550:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_extended_manifest_of, "REVISION",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1586:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(packet_for_rdata, N_("REVID"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1617:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(packets_for_certs, N_("REVID"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1652:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(packet_for_fdata, N_("FILEID"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1684:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(packet_for_fdelta, N_("OLD_FILE NEW_FILE"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1723:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(common_ancestors, N_("REV1 [REV2 [REV3 [...]]]"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1762:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(branches, "",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1814:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(tags, N_("[BRANCH_PATTERN]"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1897:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_option, N_("OPTION"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1929:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_content_changed, N_("REV FILE"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:1992:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_corresponding_path, N_("REV1 FILE REV2"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:2045:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(put_file, N_("[FILEID] CONTENTS"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:2100:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(put_revision, N_("REVISION-DATA"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:2160:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(cert, N_("REVISION-ID NAME VALUE"),
> ^
>src/cmd.hh:302:19: warning: unused parameter 'output' [-Wunused-parameter]
>    std::ostream & output) const
>                   ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:2160:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(cert, N_("REVISION-ID NAME VALUE"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:2196:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_db_variables, N_("[DOMAIN]"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:2266:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(set_db_variable, N_("DOMAIN NAME VALUE"),
> ^
>src/cmd.hh:302:19: warning: unused parameter 'output' [-Wunused-parameter]
>    std::ostream & output) const
>                   ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:2266:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(set_db_variable, N_("DOMAIN NAME VALUE"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:2296:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(drop_db_variables, N_("DOMAIN [NAME]"),
> ^
>src/cmd.hh:302:19: warning: unused parameter 'output' [-Wunused-parameter]
>    std::ostream & output) const
>                   ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:2296:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(drop_db_variables, N_("DOMAIN [NAME]"),
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:2349:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_workspace_root, "",
> ^
>src/cmd.hh:301:24: warning: unused parameter 'args' [-Wunused-parameter]
>    args_vector const & args,                                                 \
>                        ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:2349:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(get_workspace_root, "",
> ^
>src/cmd.hh:300:23: warning: unused parameter 'execid' [-Wunused-parameter]
>    command_id const & execid,                                                \
>                       ^
>src/cmd.hh:305:3: note: in expansion of macro '_CMD_AUTOMATE2'
>   _CMD_AUTOMATE2(C, true, false, params, abstract, desc, opts)
>   ^
>src/automate.cc:2372:1: note: in expansion of macro 'CMD_AUTOMATE'
> CMD_AUTOMATE(lua, "LUA_FUNCTION [ARG1 [ARG2 [...]]]",
> ^
>src/automate.cc: In static member function 'static void automate_stdio_helpers::automate_stdio_shared_setup(app_state&, const std::vector<std::basic_string<char> >&, const std::vector<std::pair<std::basic_string<char>, std::basic_string<char> > >*, commands::command_id&, const commands::automate*&, automate_stdio_helpers::force_ticker_t)':
>src/automate.cc:2426:22: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
>     CMD_REF(automate)->complete_command(id);
>                      ^
>src/automate.cc:2441:42: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
>   command const * cmd = CMD_REF(automate)->find_command(id);
>                                          ^
>In file included from src/hmac.hh:17:0,
>                 from src/hmac.cc:14:
>src/string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>\
>#	source='src/maybe_workspace_updater.cc' object='src/maybe_workspace_updater.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/maybe_workspace_updater.o src/maybe_workspace_updater.cc
>src/database_check.cc:199:61: warning: unused parameter 'checked_revisions' [-Wunused-parameter]
>                        map<revision_id, checked_revision> & checked_revisions,
>                                                             ^
>\
>#	source='src/merge_roster.cc' object='src/merge_roster.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/merge_roster.o src/merge_roster.cc
>\
>#	source='src/merge_conflict.cc' object='src/merge_conflict.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/merge_conflict.o src/merge_conflict.cc
>\
>#	source='src/merge_content.cc' object='src/merge_content.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/merge_content.o src/merge_content.cc
>src/selectors.cc:386:49: warning: unused parameter 'project' [-Wunused-parameter]
>   virtual set<revision_id> complete(project_t & project)
>                                                 ^
>\
>#	source='src/merge_3way.cc' object='src/merge_3way.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/merge_3way.o src/merge_3way.cc
>\
>#	source='src/legacy.cc' object='src/legacy.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/legacy.o src/legacy.cc
>In file included from src/annotate.cc:31:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='src/uri.cc' object='src/uri.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/uri.o src/uri.cc
>src/merge_3way.cc:96:41: warning: unused parameter 'intern' [-Wunused-parameter]
>                        interner<long> & intern)
>                                         ^
>\
>#	source='src/graph.cc' object='src/graph.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/graph.o src/graph.cc
>src/merge_conflict.cc:1490:46: warning: unused parameter 'left_roster' [-Wunused-parameter]
>                             roster_t const & left_roster,
>                                              ^
>src/merge_conflict.cc:1491:46: warning: unused parameter 'right_roster' [-Wunused-parameter]
>                             roster_t const & right_roster)
>                                              ^
>src/merge_conflict.cc:1923:42: warning: unused parameter 'right_roster' [-Wunused-parameter]
>                         roster_t const & right_roster)
>                                          ^
>src/merge_conflict.cc:2184:62: warning: unused parameter 'ancestor_rid' [-Wunused-parameter]
>                                          revision_id const & ancestor_rid,
>                                                              ^
>src/merge_conflict.cc:2303:79: warning: unused parameter 'adaptor' [-Wunused-parameter]
>                                                       content_merge_adaptor & adaptor)
>                                                                               ^
>\
>#	source='src/roster_delta.cc' object='src/roster_delta.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/roster_delta.o src/roster_delta.cc
>In file included from src/merge_content.cc:21:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>src/merge_content.cc:191:65: warning: unused parameter 'left_data' [-Wunused-parameter]
>                                               file_data const & left_data,
>                                                                 ^
>src/merge_content.cc:192:65: warning: unused parameter 'right_data' [-Wunused-parameter]
>                                               file_data const & right_data,
>                                                                 ^
>src/merge_content.cc:208:64: warning: unused parameter 'parent_data' [-Wunused-parameter]
>                                              file_data const & parent_data,
>                                                                ^
>src/merge_content.cc:290:62: warning: unused parameter 'left_ident' [-Wunused-parameter]
> content_merge_checkout_adaptor::record_merge(file_id const & left_ident,
>                                                              ^
>src/merge_content.cc:291:62: warning: unused parameter 'right_ident' [-Wunused-parameter]
>                                              file_id const & right_ident,
>                                                              ^
>src/merge_content.cc:292:62: warning: unused parameter 'merged_ident' [-Wunused-parameter]
>                                              file_id const & merged_ident,
>                                                              ^
>src/merge_content.cc:293:64: warning: unused parameter 'left_data' [-Wunused-parameter]
>                                              file_data const & left_data,
>                                                                ^
>src/merge_content.cc:294:64: warning: unused parameter 'right_data' [-Wunused-parameter]
>                                              file_data const & right_data,
>                                                                ^
>src/merge_content.cc:295:64: warning: unused parameter 'merged_data' [-Wunused-parameter]
>                                              file_data const & merged_data)
>                                                                ^
>src/merge_content.cc:301:61: warning: unused parameter 'parent_ident' [-Wunused-parameter]
> content_merge_checkout_adaptor::record_file(file_id const & parent_ident,
>                                                             ^
>src/merge_content.cc:302:61: warning: unused parameter 'merged_ident' [-Wunused-parameter]
>                                             file_id const & merged_ident,
>                                                             ^
>src/merge_content.cc:303:63: warning: unused parameter 'parent_data' [-Wunused-parameter]
>                                             file_data const & parent_data,
>                                                               ^
>src/merge_content.cc:304:63: warning: unused parameter 'merged_data' [-Wunused-parameter]
>                                             file_data const & merged_data)
>                                                               ^
>src/merge_content.cc:310:62: warning: unused parameter 'nid' [-Wunused-parameter]
> content_merge_checkout_adaptor::get_ancestral_roster(node_id nid,
>                                                              ^
>src/merge_content.cc:311:68: warning: unused parameter 'rid' [-Wunused-parameter]
>                                                      revision_id & rid,
>                                                                    ^
>src/merge_content.cc:312:83: warning: unused parameter 'anc' [-Wunused-parameter]
>                                                      shared_ptr<roster_t const> & anc)
>                                                                                   ^
>src/merge_content.cc:329:59: warning: unused parameter 'left_ident' [-Wunused-parameter]
> content_merge_empty_adaptor::record_merge(file_id const & left_ident,
>                                                           ^
>src/merge_content.cc:330:59: warning: unused parameter 'right_ident' [-Wunused-parameter]
>                                           file_id const & right_ident,
>                                                           ^
>src/merge_content.cc:331:59: warning: unused parameter 'merged_ident' [-Wunused-parameter]
>                                           file_id const & merged_ident,
>                                                           ^
>src/merge_content.cc:332:61: warning: unused parameter 'left_data' [-Wunused-parameter]
>                                           file_data const & left_data,
>                                                             ^
>src/merge_content.cc:333:61: warning: unused parameter 'right_data' [-Wunused-parameter]
>                                           file_data const & right_data,
>                                                             ^
>src/merge_content.cc:334:61: warning: unused parameter 'merged_data' [-Wunused-parameter]
>                                           file_data const & merged_data)
>                                                             ^
>src/merge_content.cc:340:58: warning: unused parameter 'parent_ident' [-Wunused-parameter]
> content_merge_empty_adaptor::record_file(file_id const & parent_ident,
>                                                          ^
>src/merge_content.cc:341:58: warning: unused parameter 'merged_ident' [-Wunused-parameter]
>                                          file_id const & merged_ident,
>                                                          ^
>src/merge_content.cc:342:60: warning: unused parameter 'parent_data' [-Wunused-parameter]
>                                          file_data const & parent_data,
>                                                            ^
>src/merge_content.cc:343:60: warning: unused parameter 'merged_data' [-Wunused-parameter]
>                                          file_data const & merged_data)
>                                                            ^
>src/merge_content.cc:349:59: warning: unused parameter 'nid' [-Wunused-parameter]
> content_merge_empty_adaptor::get_ancestral_roster(node_id nid,
>                                                           ^
>src/merge_content.cc:350:65: warning: unused parameter 'rid' [-Wunused-parameter]
>                                                   revision_id & rid,
>                                                                 ^
>src/merge_content.cc:351:80: warning: unused parameter 'anc' [-Wunused-parameter]
>                                                   shared_ptr<roster_t const> & anc)
>                                                                                ^
>src/merge_content.cc:357:58: warning: unused parameter 'ident' [-Wunused-parameter]
> content_merge_empty_adaptor::get_version(file_id const & ident,
>                                                          ^
>src/merge_content.cc:358:54: warning: unused parameter 'dat' [-Wunused-parameter]
>                                          file_data & dat) const
>                                                      ^
>\
>#	source='src/sha1.cc' object='src/sha1.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/sha1.o src/sha1.cc
>\
>#	source='src/pcrewrap.cc' object='src/pcrewrap.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/pcrewrap.o src/pcrewrap.cc
>\
>#	source='src/rev_height.cc' object='src/rev_height.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/rev_height.o src/rev_height.cc
>src/pcrewrap.cc:238:31: warning: unused parameter 'caused_by' [-Wunused-parameter]
>                  origin::type caused_by)
>                               ^
>src/pcrewrap.cc:250:43: warning: unused parameter 'regex_from' [-Wunused-parameter]
> pcre_exec_error(int errcode, origin::type regex_from, origin::type subject_from)
>                                           ^
>\
>#	source='src/rev_output.cc' object='src/rev_output.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/rev_output.o src/rev_output.cc
>\
>#	source='src/asciik.cc' object='src/asciik.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/asciik.o src/asciik.cc
>In file included from src/sha1.cc:28:0:
>src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/sha1.cc:33:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(benchmark_sha1, "benchmark_sha1", "", CMD_REF(debug), "",
> ^
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/sha1.cc:33:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(benchmark_sha1, "benchmark_sha1", "", CMD_REF(debug), "",
> ^
>src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>src/sha1.cc:33:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(benchmark_sha1, "benchmark_sha1", "", CMD_REF(debug), "",
> ^
>\
>#	source='src/dates.cc' object='src/dates.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/dates.o src/dates.cc
>set -e; if [ -f src/package_revision_raw.txt ]; then \
>  cp src/package_revision_raw.txt src/package_revision.txt; \
>fi; \
>if [ ! -f src/package_revision.txt -a -f ./src/package_revision.txt ]; then \
>  cp ./src/package_revision.txt src/package_revision.txt; \
>fi; \
>[ -f src/package_revision.txt ] || echo "unknown" > src/package_revision.txt
>set -e; if [ -f src/package_full_revision_raw.txt ]; then \
>  cp -f src/package_full_revision_raw.txt src/package_full_revision_dist.txt \
>  && (echo ''; \
>      echo '  Generated from data cached in the distribution;'; \
>      echo '  further changes may have been made.') >> src/package_full_revision_dist.txt; \
>fi; \
>if [ ! -f src/package_full_revision_dist.txt -a -f ./src/package_full_revision_dist.txt ]; then \
>  cp ./src/package_full_revision_dist.txt src/package_full_revision_dist.txt; \
>fi; \
>[ -f src/package_full_revision_dist.txt ] || echo "unknown" > src/package_full_revision_dist.txt
>./util/txt2c std_hooks src/std_hooks.lua src/std_hooks.cc
>./util/txt2c schema src/schema.sql src/schema.cc
>rm -f src/libplatform.a
>rm -f src/lib3rdparty.a
>ar cru src/libplatform.a  src/unix/read_password.o src/unix/get_system_flavour.o src/unix/process.o src/unix/terminal.o src/unix/inodeprint.o src/unix/fs.o src/unix/make_io_binary.o src/unix/os_strerror.o src/unix/cputime.o src/unix/ssh_agent_platform.o src/unix/parse_date.o 
>ar cru src/lib3rdparty.a  src/netxx/accept.o src/netxx/address.o src/netxx/datagram.o src/netxx/datagramserver.o src/netxx/osutil.o src/netxx/peer.o src/netxx/probe.o src/netxx/probe_select.o src/netxx/recvfrom.o src/netxx/serverbase.o src/netxx/sockaddr.o src/netxx/socket.o src/netxx/sockopt.o src/netxx/stream.o src/netxx/streambase.o src/netxx/streamserver.o    src/netxx/resolve_getaddrinfo.o 
>./util/txt2c --strip-trailing package_revision src/package_revision.txt src/package_revision.cc
>rm -f src/package_full_revision.txt; \
>for SRC in src/package_full_revision_raw.txt src/package_full_revision_dist.txt; do \
>    ([ -f $SRC -a ! -f src/package_full_revision.txt ] && cp -f $SRC src/package_full_revision.txt) || true; \
>done
>\
>#	source='src/std_hooks.cc' object='src/std_hooks.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/std_hooks.o src/std_hooks.cc
>\
>#	source='src/schema.cc' object='src/schema.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/schema.o src/schema.cc
>\
>In file included from src/asciik.cc:115:0:
>src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>#	source='src/package_revision.cc' object='src/package_revision.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/package_revision.o src/package_revision.cc
>./util/txt2c package_full_revision src/package_full_revision.txt src/package_full_revision.cc
>ranlib src/libplatform.a
>\
>#	source='src/package_full_revision.cc' object='src/package_full_revision.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o src/package_full_revision.o src/package_full_revision.cc
>ranlib src/lib3rdparty.a
>In file included from src/asciik.cc:116:0:
>src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>src/asciik.cc:373:1: note: in expansion of macro 'CMD'
> CMD(asciik, "asciik", "", CMD_REF(debug), N_("SELECTOR"),
> ^
>g++  -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused  -Wl,-z,relro  -o mtn src/sanity.o src/simplestring_xform.o src/constants.o src/vocab.o src/charset.o src/paths.o src/luaext_mkstemp.o src/luaext_parse_basic_io.o src/luaext_guess_binary.o src/luaext_platform.o src/luaext_globish.o src/lua.o src/mkstemp.o src/file_io.o src/globish.o src/basic_io.o src/mtn-sanity.o src/ui.o src/app_state.o src/automate_reader.o src/cache_logger.o src/commands.o src/cmd.o src/cmd_netsync.o src/cmd_list.o src/cmd_packet.o src/cmd_key_cert.o src/cmd_merging.o src/cmd_db.o src/cmd_diff_log.o src/cmd_ws_commit.o src/cmd_othervcs.o src/cmd_automate.o src/cmd_files.o src/cmd_conflicts.o src/diff_output.o src/lua_hooks.o src/transforms.o src/update.o src/work.o src/migrate_work.o src/cert.o src/project.o src/outdated_indicator.o src/database.o src/key_store.o src/ssh_agent.o src/keys.o src/packet.o src/key_packet.o src/rcs_file.o src/xdelta.o src/migrate_schema.o src/migrate_ancestry.o src/refiner.o src/enumerator.o src/netsync.o src/network/automate_session.o src/network/connection_info.o src/network/listener_base.o src/network/listener.o src/network/make_server.o src/network/netsync_session.o src/network/reactable.o src/network/reactor.o src/network/session.o src/network/session_base.o src/network/wrapped_session.o src/netxx_pipe.o src/netcmd.o src/merkle_tree.o src/lcs.o src/rcs_import.o src/git_change.o src/git_export.o src/revision.o src/ancestry.o src/cset.o src/roster.o src/mt_version.o src/automate.o src/database_check.o src/epoch.o src/gzip.o src/inodeprint.o src/selectors.o src/annotate.o src/restrictions.o src/hmac.o src/maybe_workspace_updater.o src/merge_roster.o src/merge_conflict.o src/merge_content.o src/merge_3way.o src/legacy.o src/uri.o src/graph.o src/roster_delta.o src/sha1.o src/pcrewrap.o src/rev_height.o src/rev_output.o src/asciik.o src/dates.o src/package_revision.o src/package_full_revision.o src/option.o src/options.o src/options_applicator.o src/specialized_lexical_cast.o src/monotone.o  src/unix/main.o src/std_hooks.o src/schema.o src/libplatform.a src/lib3rdparty.a  -lpcre  -lbotan-1.10  -llua -lm -ldl  -lsqlite3  -lidn   -lz 
>REAL_BLDDIR=$PWD/.; \
>(cd . && $REAL_BLDDIR/mtn manpage --norc) 2>/dev/null >mtn.1 || rm -f mtn.1
>/usr/bin/mkdir -p extra/shell
>( sed -e '/^[@]generated-command-list[@]$/,$d' < extra/shell/monotone.bash_completion.in; \
>  MTN=./mtn \
>    perl ./extra/shell/monotone_gen_bash_completion_table.pl; \
>  sed -e '1,/^[@]generated-command-list[@]$/d' < extra/shell/monotone.bash_completion.in ) | \
>  sed -e 's,[@]PACKAGE_VERSION[@],1.0,' -e 's,[@]sysconfdir[@],/etc,' > extra/shell/monotone.bash_completion
>make[2]: Leaving directory `/builddir/build/BUILD/monotone-1.0'
>make[1]: Leaving directory `/builddir/build/BUILD/monotone-1.0'
>+ exit 0
>Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.OCaj2B
>+ umask 022
>+ cd /builddir/build/BUILD
>+ '[' /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64 '!=' / ']'
>+ rm -rf /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64
>++ dirname /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64
>+ mkdir -p /builddir/build/BUILDROOT
>+ mkdir /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64
>+ cd monotone-1.0
>+ rm -rf /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64
>+ export LC_MESSAGES=en_US
>+ LC_MESSAGES=en_US
>+ make install DESTDIR=/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64
>make  install-recursive
>make[1]: Entering directory `/builddir/build/BUILD/monotone-1.0'
>Making install in doc
>make[2]: Entering directory `/builddir/build/BUILD/monotone-1.0/doc'
>make[3]: Entering directory `/builddir/build/BUILD/monotone-1.0/doc'
>make[3]: Nothing to be done for `install-exec-am'.
>test -z "/usr/share/info" || /usr/bin/mkdir -p "/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/info"
> /usr/bin/install -c -m 644 ./monotone.info ./monotone.info-1 ./monotone.info-2 '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/info'
> install-info --info-dir='/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/info' '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/info/monotone.info'
>make[3]: Leaving directory `/builddir/build/BUILD/monotone-1.0/doc'
>make[2]: Leaving directory `/builddir/build/BUILD/monotone-1.0/doc'
>make[2]: Entering directory `/builddir/build/BUILD/monotone-1.0'
>REAL_BLDDIR=$PWD/.; \
>(cd . && $REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >src/package_revision_raw.txt \
>|| (cd . && mtn --root=. automate get_base_revision_id) 2>/dev/null >src/package_revision_raw.txt \
>|| rm -f src/package_revision_raw.txt
>set -e; if [ -f src/package_revision_raw.txt ]; then \
>  cp src/package_revision_raw.txt src/package_revision.txt; \
>fi; \
>if [ ! -f src/package_revision.txt -a -f ./src/package_revision.txt ]; then \
>  cp ./src/package_revision.txt src/package_revision.txt; \
>fi; \
>[ -f src/package_revision.txt ] || echo "unknown" > src/package_revision.txt
>./util/txt2c --strip-trailing package_revision src/package_revision.txt src/package_revision.cc
>REAL_BLDDIR=$PWD/.; \
>(cd . && $REAL_BLDDIR/mtn --root=. automate get_current_revision) 2>/dev/null >src/package_full_revision_raw.txt \
>|| (cd . && mtn --root=. automate get_current_revision) 2>/dev/null >src/package_full_revision_raw.txt \
>|| rm -f src/package_full_revision_raw.txt
>set -e; if [ -f src/package_full_revision_raw.txt ]; then \
>  cp -f src/package_full_revision_raw.txt src/package_full_revision_dist.txt \
>  && (echo ''; \
>      echo '  Generated from data cached in the distribution;'; \
>      echo '  further changes may have been made.') >> src/package_full_revision_dist.txt; \
>fi; \
>if [ ! -f src/package_full_revision_dist.txt -a -f ./src/package_full_revision_dist.txt ]; then \
>  cp ./src/package_full_revision_dist.txt src/package_full_revision_dist.txt; \
>fi; \
>[ -f src/package_full_revision_dist.txt ] || echo "unknown" > src/package_full_revision_dist.txt
>rm -f src/package_full_revision.txt; \
>for SRC in src/package_full_revision_raw.txt src/package_full_revision_dist.txt; do \
>    ([ -f $SRC -a ! -f src/package_full_revision.txt ] && cp -f $SRC src/package_full_revision.txt) || true; \
>done
>./util/txt2c package_full_revision src/package_full_revision.txt src/package_full_revision.cc
>make[2]: Circular po/sv.gmo <- po/sv.gmo dependency dropped.
>make[2]: Circular po/it.gmo <- po/it.gmo dependency dropped.
>make[2]: Circular po/de.gmo <- po/de.gmo dependency dropped.
>make[2]: Circular po/pt.gmo <- po/pt.gmo dependency dropped.
>make[2]: Circular po/fr.gmo <- po/fr.gmo dependency dropped.
>make[3]: Entering directory `/builddir/build/BUILD/monotone-1.0'
>REAL_BLDDIR=$PWD/.; \
>(cd . && $REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >src/package_revision_raw.txt \
>|| (cd . && mtn --root=. automate get_base_revision_id) 2>/dev/null >src/package_revision_raw.txt \
>|| rm -f src/package_revision_raw.txt
>set -e; if [ -f src/package_revision_raw.txt ]; then \
>  cp src/package_revision_raw.txt src/package_revision.txt; \
>fi; \
>if [ ! -f src/package_revision.txt -a -f ./src/package_revision.txt ]; then \
>  cp ./src/package_revision.txt src/package_revision.txt; \
>fi; \
>[ -f src/package_revision.txt ] || echo "unknown" > src/package_revision.txt
>./util/txt2c --strip-trailing package_revision src/package_revision.txt src/package_revision.cc
>REAL_BLDDIR=$PWD/.; \
>(cd . && $REAL_BLDDIR/mtn --root=. automate get_current_revision) 2>/dev/null >src/package_full_revision_raw.txt \
>|| (cd . && mtn --root=. automate get_current_revision) 2>/dev/null >src/package_full_revision_raw.txt \
>|| rm -f src/package_full_revision_raw.txt
>set -e; if [ -f src/package_full_revision_raw.txt ]; then \
>  cp -f src/package_full_revision_raw.txt src/package_full_revision_dist.txt \
>  && (echo ''; \
>      echo '  Generated from data cached in the distribution;'; \
>      echo '  further changes may have been made.') >> src/package_full_revision_dist.txt; \
>fi; \
>if [ ! -f src/package_full_revision_dist.txt -a -f ./src/package_full_revision_dist.txt ]; then \
>  cp ./src/package_full_revision_dist.txt src/package_full_revision_dist.txt; \
>fi; \
>[ -f src/package_full_revision_dist.txt ] || echo "unknown" > src/package_full_revision_dist.txt
>rm -f src/package_full_revision.txt; \
>for SRC in src/package_full_revision_raw.txt src/package_full_revision_dist.txt; do \
>    ([ -f $SRC -a ! -f src/package_full_revision.txt ] && cp -f $SRC src/package_full_revision.txt) || true; \
>done
>./util/txt2c package_full_revision src/package_full_revision.txt src/package_full_revision.cc
>test -z "/usr/bin" || /usr/bin/mkdir -p "/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/bin"
>  /usr/bin/install -c mtn '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/bin'
>test -z "/usr/bin" || /usr/bin/mkdir -p "/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/bin"
> /usr/bin/install -c mtnopt '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/bin'
>test -z "/usr/bin" || /usr/bin/mkdir -p "/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/bin"
> /usr/bin/install -c extra/bin/mtn-cleanup '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/bin'
>test -z "/etc/bash_completion.d" || /usr/bin/mkdir -p "/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/etc/bash_completion.d"
> /usr/bin/install -c -m 644 extra/shell/monotone.bash_completion '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/etc/bash_completion.d'
>make[3]: Circular po/sv.gmo <- po/sv.gmo dependency dropped.
>make[3]: Circular po/it.gmo <- po/it.gmo dependency dropped.
>make[3]: Circular po/de.gmo <- po/de.gmo dependency dropped.
>make[3]: Circular po/pt.gmo <- po/pt.gmo dependency dropped.
>make[3]: Circular po/fr.gmo <- po/fr.gmo dependency dropped.
> /usr/bin/mkdir -p '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/locale/sv/LC_MESSAGES'
> /usr/bin/install -c -m 644 po/sv.gmo '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/locale/sv/LC_MESSAGES/monotone.mo'
> /usr/bin/mkdir -p '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/locale/it/LC_MESSAGES'
> /usr/bin/install -c -m 644 po/it.gmo '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/locale/it/LC_MESSAGES/monotone.mo'
> /usr/bin/mkdir -p '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/locale/de/LC_MESSAGES'
> /usr/bin/install -c -m 644 po/de.gmo '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/locale/de/LC_MESSAGES/monotone.mo'
> /usr/bin/mkdir -p '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/locale/pt/LC_MESSAGES'
> /usr/bin/install -c -m 644 po/pt.gmo '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/locale/pt/LC_MESSAGES/monotone.mo'
> /usr/bin/mkdir -p '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/locale/fr/LC_MESSAGES'
> /usr/bin/install -c -m 644 po/fr.gmo '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/locale/fr/LC_MESSAGES/monotone.mo'
> /usr/bin/mkdir -p '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/'
> /usr/bin/install -c -m 644 contrib/edit_comment_from_changelog.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/edit_comment_from_changelog.lua'
> /usr/bin/install -c -m 644 contrib/extra-commands.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/extra-commands.lua'
> /usr/bin/install -c -m 644 contrib/monotone-mirror-postaction-push.sh '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/monotone-mirror-postaction-push.sh'
> /usr/bin/mkdir -p '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/command'
> /usr/bin/install -c -m 644 contrib/command/fuse.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/command/fuse.lua'
> /usr/bin/install -c -m 644 contrib/command/revision.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/command/revision.lua'
> /usr/bin/install -c -m 644 contrib/command/conflicts.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/command/conflicts.lua'
> /usr/bin/install -c -m 644 contrib/command/remote_export.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/command/remote_export.lua'
> /usr/bin/install -c -m 644 contrib/command/init.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/command/init.lua'
> /usr/bin/install -c -m 644 contrib/command/README '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/command/README'
> /usr/bin/install -c -m 644 contrib/command/base.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/command/base.lua'
> /usr/bin/install -c -m 644 contrib/monotone-mirror-postaction-update.sh '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/monotone-mirror-postaction-update.sh'
> /usr/bin/install -c -m 644 contrib/Monotone.pm '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/Monotone.pm'
> /usr/bin/install -c -m 644 contrib/mtbrowse.sh '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/mtbrowse.sh'
> /usr/bin/install -c -m 644 contrib/dtrace2calltree.py '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/dtrace2calltree.py'
> /usr/bin/install -c -m 644 contrib/op2calltree.py '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/op2calltree.py'
> /usr/bin/mkdir -p '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/Attic'
> /usr/bin/install -c -m 644 contrib/Attic/monotone-nav.el '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/Attic/monotone-nav.el'
> /usr/bin/install -c -m 644 contrib/Attic/recreate-manifest-tables.sh '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/Attic/recreate-manifest-tables.sh'
> /usr/bin/install -c -m 644 contrib/ChangeLog.sh '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/ChangeLog.sh'
> /usr/bin/install -c -m 644 contrib/color-logs.conf '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/color-logs.conf'
> /usr/bin/install -c -m 644 contrib/monotone-mirror.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/monotone-mirror.lua'
> /usr/bin/install -c -m 644 contrib/monotone-inotify.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/monotone-inotify.lua'
> /usr/bin/install -c -m 644 contrib/README.missing '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/README.missing'
> /usr/bin/install -c -m 644 contrib/bisect.sh '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/bisect.sh'
> /usr/bin/install -c -m 644 contrib/get_stdio.pl '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/get_stdio.pl'
> /usr/bin/install -c -m 644 contrib/monotone-mirror.sh '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/monotone-mirror.sh'
> /usr/bin/install -c -m 644 contrib/monotone-run-script-post-netsync.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/monotone-run-script-post-netsync.lua'
> /usr/bin/install -c -m 644 contrib/parse-accounting.pl '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/parse-accounting.pl'
> /usr/bin/install -c -m 644 contrib/colorize '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/colorize'
> /usr/bin/install -c -m 644 contrib/color-logs.sh '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/color-logs.sh'
> /usr/bin/install -c -m 644 contrib/monoprof.sh '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/monoprof.sh'
> /usr/bin/install -c -m 644 contrib/README '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/README'
> /usr/bin/install -c -m 644 contrib/ciabot_monotone.py '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/ciabot_monotone.py'
> /usr/bin/install -c -m 644 contrib/monotone-log-of-pulled-revs-hook.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/monotone-log-of-pulled-revs-hook.lua'
> /usr/bin/install -c -m 644 contrib/perf-test.sh '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/perf-test.sh'
> /usr/bin/install -c -m 644 contrib/monotone.zsh_completion '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/contrib/monotone.zsh_completion'
> /usr/bin/mkdir -p '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/.'
> /usr/bin/install -c -m 644 examples/000README.txt '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/000README.txt'
> /usr/bin/install -c -m 644 examples/mirror.rc '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/mirror.rc'
> /usr/bin/install -c -m 644 examples/push.rc '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/push.rc'
> /usr/bin/install -c -m 644 examples/read-permissions '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/read-permissions'
> /usr/bin/install -c -m 644 examples/write-permissions '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/write-permissions'
> /usr/bin/mkdir -p '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/server-setup'
> /usr/bin/install -c -m 644 examples/server-setup/README '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/server-setup/README'
> /usr/bin/install -c -m 644 examples/server-setup/serverrc '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/server-setup/serverrc'
> /usr/bin/install -c -m 644 examples/server-setup/monotone.init '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/server-setup/monotone.init'
> /usr/bin/install -c -m 644 examples/server-setup/monotone.run '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/server-setup/monotone.run'
> /usr/bin/mkdir -p '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/user-setup'
> /usr/bin/install -c -m 644 examples/user-setup/README '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/user-setup/README'
> /usr/bin/install -c -m 644 examples/user-setup/monotonerc '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone/examples/user-setup/monotonerc'
>test -z "/usr/share/monotone/hooks" || /usr/bin/mkdir -p "/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/monotone/hooks"
> /usr/bin/install -c -m 644 extra/mtn-hooks/authorize_remote_automate.lua extra/mtn-hooks/get_passphrase_from_file.lua extra/mtn-hooks/monotone-buildbot.lua extra/mtn-hooks/monotone-ciabot.lua extra/mtn-hooks/monotone-cluster-push.lua extra/mtn-hooks/monotone-cvs-ignore.lua extra/mtn-hooks/monotone-mail-notify.lua '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/monotone/hooks'
>test -z "/usr/share/monotone/scripts" || /usr/bin/mkdir -p "/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/monotone/scripts"
> /usr/bin/install -c extra/mtn-hooks/monotone-ciabot.py extra/mtn-hooks/monotone-mail-notify '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/monotone/scripts'
>test -z "/usr/share/man/man1" || /usr/bin/mkdir -p "/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/man/man1"
> /usr/bin/install -c -m 644 src/util/mtnopt.1 extra/bin/mtn-cleanup.1 mtn.1 '/builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/man/man1'
>make[3]: Leaving directory `/builddir/build/BUILD/monotone-1.0'
>make[2]: Leaving directory `/builddir/build/BUILD/monotone-1.0'
>make[1]: Leaving directory `/builddir/build/BUILD/monotone-1.0'
>+ rm -f /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/info/dir
>+ mv /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/doc/monotone _doc
>+ /usr/lib/rpm/find-lang.sh /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64 monotone
>+ mkdir -p /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/sbin
>+ mkdir -p /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/var/lib
>+ ln -snf ../bin/mtn /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/sbin/monotone-server
>+ ln -snf mtn.1 /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/man/man1/monotone-server.1
>+ install -D -m 0755 -p /builddir/build/SOURCES/monotone.init /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/etc/rc.d/init.d/monotone
>+ install -D -m 0644 -p /builddir/build/SOURCES/monotone.sysconfig /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/etc/sysconfig/monotone
>+ install -d -m 0755 /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/etc/monotone
>+ install -d -m 0750 /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/etc/monotone/private-keys
>+ install -d -m 0770 /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/var/lib/monotone
>+ install -d -m 0755 /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/var/run/monotone
>+ install -D -m 0644 /builddir/build/SOURCES/monotone-server-tmpfiles.conf /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/etc/tmpfiles.d/monotone.conf
>+ install -m 0440 /dev/null /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/etc/monotone/passphrase.lua
>+ install -m 0640 /dev/null /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/etc/monotone/read-permissions
>+ install -m 0640 /dev/null /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/etc/monotone/write-permissions
>+ install -m 0644 /dev/null /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/etc/monotone/monotonerc
>+ install -m 0640 /dev/null /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/var/lib/monotone/server.mtn
>+ install -m 0644 -p /builddir/build/SOURCES/README.monotone-server .
>+ install -D -m 0644 -p contrib/Monotone.pm /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/share/perl5/vendor_perl/Monotone.pm
>+ /usr/lib/rpm/find-debuginfo.sh --strict-build-id -m --run-dwz --dwz-low-mem-die-limit 10000000 --dwz-max-die-limit 110000000 /builddir/build/BUILD/monotone-1.0
>extracting debug info from /builddir/build/BUILDROOT/monotone-1.0-17.fc21.x86_64/usr/bin/mtn
>dwz: Too few files for multifile optimization
>/usr/lib/rpm/sepdebugcrcfix: Updated 1 CRC32s, 0 CRC32s did match.
>symlinked /usr/lib/debug/usr/bin/mtn.debug to /usr/lib/debug/usr/sbin/monotone-server.debug
>5892 blocks
>+ /usr/lib/rpm/check-buildroot
>+ /usr/lib/rpm/brp-compress
>+ /usr/lib/rpm/brp-strip-static-archive /usr/bin/strip
>+ /usr/lib/rpm/brp-python-bytecompile /usr/bin/python 1
>+ /usr/lib/rpm/brp-python-hardlink
>+ /usr/lib/rpm/redhat/brp-java-repack-jars
>Executing(%check): /bin/sh -e /var/tmp/rpm-tmp.qhouIJ
>+ umask 022
>+ cd /builddir/build/BUILD
>+ cd monotone-1.0
>+ export LC_MESSAGES=en_US
>+ LC_MESSAGES=en_US
>+ export DISABLE_NETWORK_TESTS=1
>+ DISABLE_NETWORK_TESTS=1
>+ make -j16 check
>make  check-recursive
>make[1]: Entering directory `/builddir/build/BUILD/monotone-1.0'
>Making check in doc
>make[2]: Entering directory `/builddir/build/BUILD/monotone-1.0/doc'
>make[2]: Nothing to be done for `check'.
>make[2]: Leaving directory `/builddir/build/BUILD/monotone-1.0/doc'
>make[2]: Entering directory `/builddir/build/BUILD/monotone-1.0'
>REAL_BLDDIR=$PWD/.; \
>(cd . && $REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >src/package_revision_raw.txt \
>|| (cd . && mtn --root=. automate get_base_revision_id) 2>/dev/null >src/package_revision_raw.txt \
>|| rm -f src/package_revision_raw.txt
>REAL_BLDDIR=$PWD/.; \
>(cd . && $REAL_BLDDIR/mtn --root=. automate get_current_revision) 2>/dev/null >src/package_full_revision_raw.txt \
>|| (cd . && mtn --root=. automate get_current_revision) 2>/dev/null >src/package_full_revision_raw.txt \
>|| rm -f src/package_full_revision_raw.txt
>make[2]: Circular po/sv.gmo <- po/sv.gmo dependency dropped.
>make[2]: Circular po/it.gmo <- po/it.gmo dependency dropped.
>make[2]: Circular po/de.gmo <- po/de.gmo dependency dropped.
>make[2]: Circular po/pt.gmo <- po/pt.gmo dependency dropped.
>make[2]: Circular po/fr.gmo <- po/fr.gmo dependency dropped.
>set -e; if [ -f src/package_revision_raw.txt ]; then \
>  cp src/package_revision_raw.txt src/package_revision.txt; \
>fi; \
>if [ ! -f src/package_revision.txt -a -f ./src/package_revision.txt ]; then \
>  cp ./src/package_revision.txt src/package_revision.txt; \
>fi; \
>[ -f src/package_revision.txt ] || echo "unknown" > src/package_revision.txt
>set -e; if [ -f src/package_full_revision_raw.txt ]; then \
>  cp -f src/package_full_revision_raw.txt src/package_full_revision_dist.txt \
>  && (echo ''; \
>      echo '  Generated from data cached in the distribution;'; \
>      echo '  further changes may have been made.') >> src/package_full_revision_dist.txt; \
>fi; \
>if [ ! -f src/package_full_revision_dist.txt -a -f ./src/package_full_revision_dist.txt ]; then \
>  cp ./src/package_full_revision_dist.txt src/package_full_revision_dist.txt; \
>fi; \
>[ -f src/package_full_revision_dist.txt ] || echo "unknown" > src/package_full_revision_dist.txt
>./util/txt2c --strip-trailing package_revision src/package_revision.txt src/package_revision.cc
>rm -f src/package_full_revision.txt; \
>for SRC in src/package_full_revision_raw.txt src/package_full_revision_dist.txt; do \
>    ([ -f $SRC -a ! -f src/package_full_revision.txt ] && cp -f $SRC src/package_full_revision.txt) || true; \
>done
>./util/txt2c package_full_revision src/package_full_revision.txt src/package_full_revision.cc
>make  test/bin/unit_tester test/bin/tester test/bin/check_net
>make[3]: Entering directory `/builddir/build/BUILD/monotone-1.0'
>./util/txt2c testlib test/src/testlib.lua test/src/testlib.cc
>\
>#	source='test/unit/tests/basic_io.cc' object='test/unit/tests/basic_io.o' libtool=no 
>\
>#	source='test/unit/tests/charset.cc' object='test/unit/tests/charset.o' libtool=no 
>\
>#	source='test/unit/tests/commands.cc' object='test/unit/tests/commands.o' libtool=no 
>\
>#	source='test/unit/tests/cset.cc' object='test/unit/tests/cset.o' libtool=no 
>\
>#	source='test/unit/tests/git_change.cc' object='test/unit/tests/git_change.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/basic_io.o test/unit/tests/basic_io.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/charset.o test/unit/tests/charset.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/commands.o test/unit/tests/commands.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/cset.o test/unit/tests/cset.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/git_change.o test/unit/tests/git_change.cc
>\
>#	source='test/unit/tests/globish.cc' object='test/unit/tests/globish.o' libtool=no 
>\
>#	source='test/unit/tests/graph.cc' object='test/unit/tests/graph.o' libtool=no 
>\
>#	source='test/unit/tests/merge_3way.cc' object='test/unit/tests/merge_3way.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/globish.o test/unit/tests/globish.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/graph.o test/unit/tests/graph.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/merge_3way.o test/unit/tests/merge_3way.cc
>\
>#	source='test/unit/tests/merge_roster.cc' object='test/unit/tests/merge_roster.o' libtool=no 
>\
>#	source='test/unit/tests/mkstemp.cc' object='test/unit/tests/mkstemp.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/merge_roster.o test/unit/tests/merge_roster.cc
>\
>#	source='test/unit/tests/netcmd.cc' object='test/unit/tests/netcmd.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/mkstemp.o test/unit/tests/mkstemp.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/netcmd.o test/unit/tests/netcmd.cc
>\
>#	source='test/unit/tests/netxx_pipe.cc' object='test/unit/tests/netxx_pipe.o' libtool=no 
>\
>#	source='test/unit/tests/option.cc' object='test/unit/tests/option.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/netxx_pipe.o test/unit/tests/netxx_pipe.cc
>\
>#	source='test/unit/tests/outdated_indicator.cc' object='test/unit/tests/outdated_indicator.o' libtool=no 
>\
>#	source='test/unit/tests/pcrewrap.cc' object='test/unit/tests/pcrewrap.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/option.o test/unit/tests/option.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/outdated_indicator.o test/unit/tests/outdated_indicator.cc
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/pcrewrap.o test/unit/tests/pcrewrap.cc
>\
>#	source='test/unit/tests/refiner.cc' object='test/unit/tests/refiner.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/refiner.o test/unit/tests/refiner.cc
>In file included from test/unit/tests/charset.cc:13:0:
>test/unit/tests/../../../src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>test/unit/tests/../../../src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='test/unit/tests/restrictions.cc' object='test/unit/tests/restrictions.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/restrictions.o test/unit/tests/restrictions.cc
>\
>#	source='test/unit/tests/revision.cc' object='test/unit/tests/revision.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/revision.o test/unit/tests/revision.cc
>\
>#	source='test/unit/tests/simplestring_xform.cc' object='test/unit/tests/simplestring_xform.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/simplestring_xform.o test/unit/tests/simplestring_xform.cc
>In file included from test/unit/tests/../../../src/hmac.hh:17:0,
>                 from test/unit/tests/../../../src/netcmd.hh:23,
>                 from test/unit/tests/../../../src/refiner.hh:17,
>                 from test/unit/tests/refiner.cc:12:
>test/unit/tests/../../../src/string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>\
>#	source='test/unit/tests/transforms.cc' object='test/unit/tests/transforms.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/transforms.o test/unit/tests/transforms.cc
>test/unit/tests/refiner.cc:45:50: warning: unused parameter 'ty' [-Wunused-parameter]
>     virtual void queue_done_cmd(netcmd_item_type ty,
>                                                  ^
>In file included from test/unit/tests/simplestring_xform.cc:12:0:
>test/unit/tests/../../../src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>test/unit/tests/../../../src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='test/unit/tests/uri.cc' object='test/unit/tests/uri.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/uri.o test/unit/tests/uri.cc
>In file included from test/unit/tests/../../../src/hmac.hh:17:0,
>                 from test/unit/tests/../../../src/netcmd.hh:23,
>                 from test/unit/tests/netcmd.cc:12:
>test/unit/tests/../../../src/string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>\
>#	source='test/unit/tests/vocab.cc' object='test/unit/tests/vocab.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/vocab.o test/unit/tests/vocab.cc
>In file included from test/unit/tests/merge_3way.cc:18:0:
>test/unit/tests/../../../src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>test/unit/tests/../../../src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='test/unit/tests/numeric_vocab.cc' object='test/unit/tests/numeric_vocab.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/numeric_vocab.o test/unit/tests/numeric_vocab.cc
>test/unit/tests/graph.cc:203:49: warning: unused parameter 'node' [-Wunused-parameter]
>   virtual void get_children(revision_id const & node, set<revision_id> & parents) const
>                                                 ^
>test/unit/tests/graph.cc:203:74: warning: unused parameter 'parents' [-Wunused-parameter]
>   virtual void get_children(revision_id const & node, set<revision_id> & parents) const
>                                                                          ^
>\
>#	source='test/unit/tests/sha1.cc' object='test/unit/tests/sha1.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/sha1.o test/unit/tests/sha1.cc
>In file included from test/unit/tests/commands.cc:14:0:
>test/unit/tests/../../../src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>test/unit/tests/../../../src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>In file included from test/unit/tests/commands.cc:13:0:
>test/unit/tests/../../../src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>test/unit/tests/../../../src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>test/unit/tests/commands.cc:34:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(__root__, "__root__", "", NULL, "", "");
> ^
>test/unit/tests/../../../src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>test/unit/tests/../../../src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>test/unit/tests/commands.cc:34:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(__root__, "__root__", "", NULL, "", "");
> ^
>test/unit/tests/../../../src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>test/unit/tests/../../../src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>test/unit/tests/commands.cc:34:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(__root__, "__root__", "", NULL, "", "");
> ^
>test/unit/tests/../../../src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>test/unit/tests/../../../src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>test/unit/tests/commands.cc:36:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(top, "top", "", CMD_REF(__root__),
> ^
>test/unit/tests/../../../src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>test/unit/tests/../../../src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>test/unit/tests/commands.cc:36:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(top, "top", "", CMD_REF(__root__),
> ^
>test/unit/tests/../../../src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>test/unit/tests/../../../src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>test/unit/tests/commands.cc:36:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(top, "top", "", CMD_REF(__root__),
> ^
>test/unit/tests/../../../src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:38:1: note: in expansion of macro 'CMD'
> CMD(test, "test", "", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:38:1: note: in expansion of macro 'CMD'
> CMD(test, "test", "", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:38:1: note: in expansion of macro 'CMD'
> CMD(test, "test", "", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:40:1: note: in expansion of macro 'CMD'
> CMD(test1, "test1", "alias1", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:40:1: note: in expansion of macro 'CMD'
> CMD(test1, "test1", "alias1", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:40:1: note: in expansion of macro 'CMD'
> CMD(test1, "test1", "alias1", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:42:1: note: in expansion of macro 'CMD'
> CMD(test2, "test2", "alias2", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:42:1: note: in expansion of macro 'CMD'
> CMD(test2, "test2", "alias2", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:42:1: note: in expansion of macro 'CMD'
> CMD(test2, "test2", "alias2", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>test/unit/tests/../../../src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:44:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(test3, "test3", "", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>test/unit/tests/../../../src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:44:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(test3, "test3", "", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>test/unit/tests/../../../src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:44:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(test3, "test3", "", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:242:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>test/unit/tests/../../../src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>test/unit/tests/commands.cc:47:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(testg, "testg", "aliasg", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:243:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>test/unit/tests/../../../src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>test/unit/tests/commands.cc:47:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(testg, "testg", "aliasg", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:244:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const       \
>                                                    ^
>test/unit/tests/../../../src/cmd.hh:250:3: note: in expansion of macro '_CMD_GROUP2'
>   _CMD_GROUP2(C, name, aliases, parent, abstract, desc, true)
>   ^
>test/unit/tests/commands.cc:47:1: note: in expansion of macro 'CMD_GROUP'
> CMD_GROUP(testg, "testg", "aliasg", CMD_REF(top),
> ^
>test/unit/tests/../../../src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:49:1: note: in expansion of macro 'CMD'
> CMD(testg1, "testg1", "", CMD_REF(testg),
> ^
>test/unit/tests/../../../src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:49:1: note: in expansion of macro 'CMD'
> CMD(testg1, "testg1", "", CMD_REF(testg),
> ^
>test/unit/tests/../../../src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:49:1: note: in expansion of macro 'CMD'
> CMD(testg1, "testg1", "", CMD_REF(testg),
> ^
>test/unit/tests/../../../src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:51:1: note: in expansion of macro 'CMD'
> CMD(testg2, "testg2", "", CMD_REF(testg),
> ^
>test/unit/tests/../../../src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:51:1: note: in expansion of macro 'CMD'
> CMD(testg2, "testg2", "", CMD_REF(testg),
> ^
>test/unit/tests/../../../src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>test/unit/tests/../../../src/cmd.hh:222:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, false, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:51:1: note: in expansion of macro 'CMD'
> CMD(testg2, "testg2", "", CMD_REF(testg),
> ^
>test/unit/tests/../../../src/cmd.hh:217:44: warning: unused parameter 'app' [-Wunused-parameter]
> void commands::cmd_ ## C::exec(app_state & app,                      \
>                                            ^
>test/unit/tests/../../../src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:53:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(testg3, "testg3", "", CMD_REF(testg),
> ^
>test/unit/tests/../../../src/cmd.hh:218:51: warning: unused parameter 'execid' [-Wunused-parameter]
>                                command_id const & execid,            \
>                                                   ^
>test/unit/tests/../../../src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:53:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(testg3, "testg3", "", CMD_REF(testg),
> ^
>test/unit/tests/../../../src/cmd.hh:219:52: warning: unused parameter 'args' [-Wunused-parameter]
>                                args_vector const & args) const
>                                                    ^
>test/unit/tests/../../../src/cmd.hh:225:3: note: in expansion of macro '_CMD2'
>   _CMD2(C, name, aliases, parent, true, params, abstract, desc, opts)
>   ^
>test/unit/tests/commands.cc:53:1: note: in expansion of macro 'CMD_HIDDEN'
> CMD_HIDDEN(testg3, "testg3", "", CMD_REF(testg),
> ^
>\
>#	source='test/unit/tests/string_queue.cc' object='test/unit/tests/string_queue.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/string_queue.o test/unit/tests/string_queue.cc
>\
>#	source='test/unit/unit_tester.cc' object='test/unit/unit_tester.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/unit_tester.o test/unit/unit_tester.cc
>In file included from test/unit/tests/string_queue.cc:14:0:
>test/unit/tests/../../../src/string_queue.hh:246:32: warning: unused parameter 'from' [-Wunused-parameter]
>   string_queue (string_queue & from)
>                                ^
>\
>#	source='test/unit/tests/dates.cc' object='test/unit/tests/dates.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/dates.o test/unit/tests/dates.cc
>\
>#	source='test/unit/tests/key_packet.cc' object='test/unit/tests/key_packet.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/key_packet.o test/unit/tests/key_packet.cc
>\
>#	source='test/unit/tests/packet.cc' object='test/unit/tests/packet.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/packet.o test/unit/tests/packet.cc
>\
>#	source='test/unit/tests/paths.cc' object='test/unit/tests/paths.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/paths.o test/unit/tests/paths.cc
>\
>#	source='test/unit/tests/rev_height.cc' object='test/unit/tests/rev_height.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/rev_height.o test/unit/tests/rev_height.cc
>\
>#	source='test/unit/tests/roster.cc' object='test/unit/tests/roster.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/tests/roster.o test/unit/tests/roster.cc
>In file included from test/unit/tests/../../../src/key_packet.cc:25:0,
>                 from test/unit/tests/key_packet.cc:17:
>test/unit/tests/../../../src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>test/unit/tests/../../../src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>In file included from test/unit/tests/../../../src/packet.cc:21:0,
>                 from test/unit/tests/packet.cc:16:
>test/unit/tests/../../../src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>test/unit/tests/../../../src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>\
>#	source='test/unit/randomizer.cc' object='test/unit/randomizer.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/unit/randomizer.o test/unit/randomizer.cc
>\
>#	source='test/src/tester.cc' object='test/src/tester.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/src/tester.o test/src/tester.cc
>\
>#	source='test/src/unix/tester-plaf.cc' object='test/src/unix/tester-plaf.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/src/unix/tester-plaf.o test/src/unix/tester-plaf.cc
>\
>#	source='test/src/testlib.cc' object='test/src/testlib.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/src/testlib.o test/src/testlib.cc
>\
>#	source='test/src/unix/tester-check-net.cc' object='test/src/unix/tester-check-net.o' libtool=no 
>g++  -I.    -I/usr/include/botan-1.10           -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused -c -o test/src/unix/tester-check-net.o test/src/unix/tester-check-net.cc
>test/src/unix/tester-check-net.cc:40:25: warning: unused parameter 'unused' [-Wunused-parameter]
> static void sigalrm(int unused)
>                         ^
>g++  -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused  -Wl,-z,relro  -o test/bin/check_net test/src/unix/tester-check-net.o src/libplatform.a src/lib3rdparty.a  -lpcre  -lbotan-1.10  -llua -lm -ldl  -lsqlite3  -lidn   -lz 
>test/src/unix/tester-plaf.cc: In function 'void prepare_for_parallel_testcases(int, int, int)':
>test/src/unix/tester-plaf.cc:387:30: warning: ignoring return value of 'ssize_t write(int, const void*, size_t)', declared with attribute warn_unused_result [-Wunused-result]
>         write(jwrite, "+", 1);
>                              ^
>test/src/unix/tester-plaf.cc: In function 'void release_token()':
>test/src/unix/tester-plaf.cc:342:32: warning: ignoring return value of 'ssize_t write(int, const void*, size_t)', declared with attribute warn_unused_result [-Wunused-result]
>     write(jobsvr_write, "+", 1);
>                                ^
>In file included from test/unit/tests/../../../src/roster.cc:25:0,
>                 from test/unit/tests/roster.cc:14:
>test/unit/tests/../../../src/simplestring_xform.hh:51:61: warning: unused parameter 'thing' [-Wunused-parameter]
> origin::type get_made_from<std::string>(std::string const & thing)
>                                                             ^
>test/unit/tests/../../../src/simplestring_xform.hh:61:76: warning: unused parameter 'made_from' [-Wunused-parameter]
> std::string from_string<std::string>(std::string const & str, origin::type made_from)
>                                                                            ^
>In file included from test/unit/tests/roster.cc:14:0:
>test/unit/tests/../../../src/roster.cc:2191:47: warning: unused parameter 'n' [-Wunused-parameter]
>                           node_id nid, node_t n,
>                                               ^
>test/src/tester.cc:41:38: warning: unused parameter 'msg' [-Wunused-parameter]
>   void inform_log(std::string const &msg)
>                                      ^
>In file included from test/src/tester.cc:14:0:
>test/src/../../src/lua.hh:118:64: warning: unused parameter 'LS' [-Wunused-parameter]
> int luaext :: extfn_ ## NAME ## _ ## TABLE :: call(lua_State * LS)
>                                                                ^
>test/src/tester.cc:370:1: note: in expansion of macro 'LUAEXT'
> LUAEXT(save_env, )
> ^
>test/src/../../src/lua.hh:118:64: warning: unused parameter 'LS' [-Wunused-parameter]
> int luaext :: extfn_ ## NAME ## _ ## TABLE :: call(lua_State * LS)
>                                                                ^
>test/src/tester.cc:376:1: note: in expansion of macro 'LUAEXT'
> LUAEXT(restore_env, )
> ^
>test/src/../../src/lua.hh:118:64: warning: unused parameter 'LS' [-Wunused-parameter]
> int luaext :: extfn_ ## NAME ## _ ## TABLE :: call(lua_State * LS)
>                                                                ^
>test/src/tester.cc:426:1: note: in expansion of macro 'LUAEXT'
> LUAEXT(require_not_root, )
> ^
>test/unit/tests/roster.cc: In instantiation of 'void {anonymous}::X_attr_existing_node_scalar<T>::set(const revision_id&, {anonymous}::scalar_val, const std::set<revision<id> >&, roster_t&, marking_map&) [with T = {anonymous}::dir_maker; revision_id = revision<id>]':
>test/unit/tests/roster.cc:2371:1:   required from here
>test/unit/tests/roster.cc:1000:29: warning: unused parameter 'scalar_origin_rid' [-Wunused-parameter]
>     set(revision_id const & scalar_origin_rid, scalar_val val,
>                             ^
>test/unit/tests/roster.cc: In instantiation of 'void {anonymous}::X_attr_existing_node_scalar<T>::set(const revision_id&, {anonymous}::scalar_val, const std::set<revision<id> >&, roster_t&, marking_map&) [with T = {anonymous}::file_maker; revision_id = revision<id>]':
>test/unit/tests/roster.cc:2371:1:   required from here
>test/unit/tests/roster.cc:1000:29: warning: unused parameter 'scalar_origin_rid' [-Wunused-parameter]
>g++  -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused  -Wl,-z,relro  -o test/bin/tester test/src/tester.o src/transforms.o src/gzip.o src/sanity.o src/simplestring_xform.o src/constants.o src/vocab.o src/charset.o src/paths.o src/luaext_mkstemp.o src/luaext_parse_basic_io.o src/luaext_guess_binary.o src/luaext_platform.o src/luaext_globish.o src/lua.o src/mkstemp.o src/file_io.o src/globish.o src/basic_io.o src/pcrewrap.o src/specialized_lexical_cast.o  test/src/unix/tester-plaf.o test/src/testlib.o src/libplatform.a src/lib3rdparty.a  -lpcre  -lbotan-1.10  -llua -lm -ldl  -lsqlite3  -lidn   -lz 
>g++  -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Wall -W -Wno-unused  -Wl,-z,relro  -o test/bin/unit_tester test/unit/tests/basic_io.o test/unit/tests/charset.o test/unit/tests/commands.o test/unit/tests/cset.o test/unit/tests/git_change.o test/unit/tests/globish.o test/unit/tests/graph.o test/unit/tests/merge_3way.o test/unit/tests/merge_roster.o test/unit/tests/mkstemp.o test/unit/tests/netcmd.o test/unit/tests/netxx_pipe.o test/unit/tests/option.o test/unit/tests/outdated_indicator.o test/unit/tests/pcrewrap.o test/unit/tests/refiner.o test/unit/tests/restrictions.o test/unit/tests/revision.o test/unit/tests/simplestring_xform.o test/unit/tests/transforms.o test/unit/tests/uri.o test/unit/tests/vocab.o test/unit/tests/numeric_vocab.o test/unit/tests/sha1.o test/unit/tests/string_queue.o test/unit/unit_tester.o test/unit/tests/dates.o test/unit/tests/key_packet.o test/unit/tests/packet.o test/unit/tests/paths.o test/unit/tests/rev_height.o test/unit/tests/roster.o src/basic_io.o src/charset.o src/commands.o src/cset.o src/git_change.o src/globish.o src/graph.o src/merge_3way.o src/merge_roster.o src/mkstemp.o src/netcmd.o src/netxx_pipe.o src/option.o src/outdated_indicator.o src/pcrewrap.o src/refiner.o src/restrictions.o src/revision.o src/simplestring_xform.o src/transforms.o src/uri.o src/vocab.o src/xdelta.o src/constants.o src/file_io.o src/gzip.o src/hmac.o src/lcs.o src/merkle_tree.o src/roster_delta.o src/sanity.o src/specialized_lexical_cast.o test/unit/randomizer.o src/libplatform.a src/lib3rdparty.a  -lpcre  -lbotan-1.10  -llua -lm -ldl  -lsqlite3  -lidn   -lz 
>make[3]: Leaving directory `/builddir/build/BUILD/monotone-1.0'
>make  check-local
>make[3]: Entering directory `/builddir/build/BUILD/monotone-1.0'
>{ echo '#!/bin/sh';						  	\
>  echo 'export LANG=C';							  	\
>  echo 'PATH=/builddir/build/BUILD/monotone-1.0:/builddir/build/BUILD/monotone-1.0/test/bin:$PATH';	  		\
>  echo './test/bin/tester ./test/tester-testsuite.lua "$@"';	\
>  echo 'echo $? > ./test/tester.status';		  	  	\
>  echo 'exit 0'; } > run_tester_tests && \
>chmod 755 run_tester_tests
>{ echo '#!/bin/sh';						  	\
>  echo 'export LANG=C';							  	\
>  echo 'PATH=/builddir/build/BUILD/monotone-1.0:/builddir/build/BUILD/monotone-1.0/test/bin:$PATH';	  		\
>  echo './test/bin/tester ./test/unit-testsuite.lua "$@"';	\
>  echo 'echo $? > ./test/unit.status';		  	  	\
>  echo 'exit 0'; } > run_unit_tests && \
>chmod 755 run_unit_tests
>{ echo '#!/bin/sh';						  	\
>  echo 'export LANG=C';							  	\
>  echo 'PATH=/builddir/build/BUILD/monotone-1.0:/builddir/build/BUILD/monotone-1.0/test/bin:$PATH';	  		\
>  echo './test/bin/tester ./test/func-testsuite.lua "$@"';	\
>  echo 'echo $? > ./test/func.status';		  	  	\
>  echo 'exit 0'; } > run_func_tests && \
>chmod 755 run_func_tests
>REAL_BLDDIR=$PWD/.; \
>(cd . && $REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >src/package_revision_raw.txt \
>|| (cd . && mtn --root=. automate get_base_revision_id) 2>/dev/null >src/package_revision_raw.txt \
>|| rm -f src/package_revision_raw.txt
>REAL_BLDDIR=$PWD/.; \
>(cd . && $REAL_BLDDIR/mtn --root=. automate get_current_revision) 2>/dev/null >src/package_full_revision_raw.txt \
>|| (cd . && mtn --root=. automate get_current_revision) 2>/dev/null >src/package_full_revision_raw.txt \
>|| rm -f src/package_full_revision_raw.txt
>{ echo '#!/bin/sh';						  	\
>  echo 'export LANG=C';							  	\
>  echo 'PATH=/builddir/build/BUILD/monotone-1.0:/builddir/build/BUILD/monotone-1.0/test/bin:$PATH';	  		\
>  echo './test/bin/tester ./test/extra-testsuite.lua "$@"';	\
>  echo 'echo $? > ./test/extra.status';		  	  	\
>  echo 'exit 0'; } > run_extra_tests && \
>chmod 755 run_extra_tests
>./run_tester_tests
>./run_unit_tests
>./run_extra_tests
>Running tests...
>  1 cleanup-1                                     ok 0:00, 0:00 on CPU
>  2 cleanup-2                                     ok 0:00, 0:00 on CPU
>  3 isolated-1                                    ok 0:00, 0:00 on CPU
>  4 isolated-2                                    ok 0:00, 0:00 on CPU
>  5 remove-unwriteable                            ok 0:00, 0:00 on CPU
>  6 running_commands                              ok 0:00, 0:00 on CPU
>Of 6 tests run:
>	6 succeeded
>	0 failed
>	0 had expected failures
>	0 succeeded unexpectedly
>	0 were skipped
>Running tests...
>set -e; if [ -f src/package_revision_raw.txt ]; then \
>  cp src/package_revision_raw.txt src/package_revision.txt; \
>fi; \
>if [ ! -f src/package_revision.txt -a -f ./src/package_revision.txt ]; then \
>  cp ./src/package_revision.txt src/package_revision.txt; \
>fi; \
>[ -f src/package_revision.txt ] || echo "unknown" > src/package_revision.txt
>set -e; if [ -f src/package_full_revision_raw.txt ]; then \
>  cp -f src/package_full_revision_raw.txt src/package_full_revision_dist.txt \
>  && (echo ''; \
>      echo '  Generated from data cached in the distribution;'; \
>      echo '  further changes may have been made.') >> src/package_full_revision_dist.txt; \
>fi; \
>if [ ! -f src/package_full_revision_dist.txt -a -f ./src/package_full_revision_dist.txt ]; then \
>  cp ./src/package_full_revision_dist.txt src/package_full_revision_dist.txt; \
>fi; \
>[ -f src/package_full_revision_dist.txt ] || echo "unknown" > src/package_full_revision_dist.txt
>  1 authorize-remote-automate                     skipped (line 1) 0:00, 0:00 on CPU
>./util/txt2c --strip-trailing package_revision src/package_revision.txt src/package_revision.cc
>rm -f src/package_full_revision.txt; \
>for SRC in src/package_full_revision_raw.txt src/package_full_revision_dist.txt; do \
>    ([ -f $SRC -a ! -f src/package_full_revision.txt ] && cp -f $SRC src/package_full_revision.txt) || true; \
>done
>./util/txt2c package_full_revision src/package_full_revision.txt src/package_full_revision.cc
>./run_func_tests
>Running tests...
>Running tests...
>  1 _unit_tester_fail_check                       ok 0:00, 0:00 on CPU
>  3 (imp)_persistent_netsync_server_-_keys_2      skipped (line 2) 0:00, 0:00 on CPU
>  9 (normal)_netsync_on_partially_unrelated_revisions skipped (line 2) 0:00, 0:00 on CPU
> 10 (normal)_netsync_revision_with_no_certs       skipped (line 2) 0:00, 0:00 on CPU
>  5 _unit_tester_uncaught                         ok 0:00, 0:00 on CPU
>  2 _unit_tester_fail_nothrow                     ok 0:00, 0:00 on CPU
>  3 _unit_tester_fail_require                     ok 0:00, 0:00 on CPU
>  4 _unit_tester_fail_throw                       ok 0:00, 0:00 on CPU
> 12 (todo)_design_approval_semantics              expected failure (line 3) 0:00, 0:00 on CPU
> 13 (todo)_undo_update_command                    expected failure (line 3) 0:00, 0:00 on CPU
>  7 _unit_tester_uncaught_std_what                ok 0:00, 0:00 on CPU
>  6 _unit_tester_uncaught_std                     ok 0:00, 0:00 on CPU
>  8 basic_io_binary_transparency                  ok 0:00, 0:00 on CPU
>  9 charset_idna_encoding                         ok 0:01, 0:00 on CPU
> 10 charset_utf8_validation                       ok 0:00, 0:00 on CPU
> 11 commands_command_complete_command             ok 0:00, 0:00 on CPU
> 12 commands_command_find_command                 ok 0:00, 0:00 on CPU
> 13 commands_complete_command                     ok 0:00, 0:00 on CPU
> 14 commands_make_command_id                      ok 0:00, 0:00 on CPU
> 15 cset_basic_csets                              ok 0:00, 0:00 on CPU
> 16 cset_cset_written                             ok 0:00, 0:00 on CPU
> 17 cset_invalid_csets                            ok 0:00, 0:00 on CPU
> 18 cset_root_dir                                 ok 0:00, 0:00 on CPU
> 19 dates_comparisons                             ok 0:00, 0:00 on CPU
> 20 dates_from_string                             ok 0:00, 0:00 on CPU
> 21 dates_from_unix_epoch                         ok 0:00, 0:00 on CPU
> 14 (todo)_vcheck                                 expected failure (line 5) 0:06, 0:00 on CPU
> 22 dates_localtime_formats                       ok 0:05, 0:04 on CPU
> 23 dates_our_timegm                              ok 0:00, 0:00 on CPU
> 25 git_change_reorder_chained_renames            ok 0:00, 0:00 on CPU
> 26 git_change_reorder_rename_loop                ok 0:00, 0:00 on CPU
> 27 git_change_reorder_reversed_rename_loop       ok 0:00, 0:00 on CPU
> 28 git_change_reorder_swapped_renames            ok 0:00, 0:00 on CPU
> 29 globish_complex_matches                       ok 0:00, 0:00 on CPU
> 30 globish_from_vector                           ok 0:00, 0:00 on CPU
> 31 globish_nested_matches                        ok 0:00, 0:00 on CPU
> 32 globish_simple_matches                        ok 0:00, 0:00 on CPU
> 33 globish_syntax                                ok 0:00, 0:00 on CPU
> 34 graph_get_uncommon_ancestors_nasty_convexity_case ok 0:00, 0:00 on CPU
> 38 key_packet_validators                         ok 0:00, 0:00 on CPU
> 37 key_packet_roundabout                         ok 0:00, 0:00 on CPU
> 40 merge_3way_merge_append                       ok 0:00, 0:00 on CPU
> 39 merge_3way_merge_additions                    ok 0:00, 0:00 on CPU
> 41 merge_3way_merge_deletions                    ok 0:00, 0:00 on CPU
> 42 merge_3way_merge_prepend                      ok 0:00, 0:00 on CPU
> 44 merge_roster_attr_lifecycle                   ok 0:00, 0:00 on CPU
> 45 merge_roster_complex_structural_conflicts     ok 0:00, 0:00 on CPU
> 46 merge_roster_node_lifecycle                   ok 0:00, 0:00 on CPU
> 43 merge_3way_randomizing_merge                  ok 0:00, 0:00 on CPU
> 47 merge_roster_scalar_merges                    ok 0:00, 0:00 on CPU
> 48 merge_roster_simple_structural_conflicts      ok 0:00, 0:00 on CPU
> 50 netcmd_functions                              ok 0:00, 0:00 on CPU
> 51 netcmd_mac                                    ok 0:00, 0:00 on CPU
> 49 mkstemp_basic                                 ok 0:00, 0:00 on CPU
> 52 netxx_pipe_simple_pipe                        ok 0:00, 0:00 on CPU
> 53 numeric_vocab_widen                           ok 0:00, 0:00 on CPU
> 54 option_concrete_options                       ok 0:00, 0:00 on CPU
> 55 outdated_indicator_basic                      ok 0:00, 0:00 on CPU
> 56 packet_roundabout                             ok 0:00, 0:00 on CPU
> 24 dates_roundtrip_localtimes                    ok 0:07, 0:06 on CPU
> 58 paths_access_tracker                          ok 0:00, 0:00 on CPU
> 57 packet_validators                             ok 0:00, 0:00 on CPU
> 61 paths_depth                                   ok 0:00, 0:00 on CPU
> 17 _--confdir_option_and_get_confdir_lua_function_work ok 0:02, 0:00 on CPU
> 16 _--author,_--date                             ok 0:11, 0:00 on CPU
>  7 (minor)_test_a_merge_4                        expected failure (line 30) 0:13, 0:00 on CPU
> 15 CRLF_line_normalization                       ok 0:13, 0:00 on CPU
> 18 _--db_with_parent_dir                         ok 0:05, 0:00 on CPU
> 59 paths_basename                                ok 0:00, 0:00 on CPU
> 60 paths_bookkeeping                             ok 0:00, 0:00 on CPU
> 64 paths_file_path_external_prefix__MTN          ok 0:00, 0:00 on CPU
> 62 paths_dirname                                 ok 0:00, 0:00 on CPU
> 65 paths_file_path_external_prefix_a_b           ok 0:00, 0:00 on CPU
> 63 paths_file_path_external_null_prefix          ok 0:00, 0:00 on CPU
> 67 paths_find_old_new_path_for                   ok 0:00, 0:00 on CPU
> 68 paths_ordering                                ok 0:00, 0:00 on CPU
> 66 paths_file_path_internal                      ok 0:00, 0:00 on CPU
> 71 paths_system                                  ok 0:00, 0:00 on CPU
> 69 paths_ordering_random                         ok 0:00, 0:00 on CPU
> 72 paths_test_external_string_is_bookkeeping_path_prefix__MTN ok 0:00, 0:00 on CPU
> 70 paths_path_component                          ok 0:00, 0:00 on CPU
> 73 paths_test_external_string_is_bookkeeping_path_prefix_a_b ok 0:00, 0:00 on CPU
> 74 paths_test_external_string_is_bookkeeping_path_prefix_none ok 0:00, 0:00 on CPU
>  6 (minor)_test_a_merge_3                        expected failure (line 30) 0:13, 0:00 on CPU
> 75 paths_test_internal_string_is_bookkeeping_path ok 0:00, 0:00 on CPU
> 36 graph_random_get_reconstruction_path          ok 0:01, 0:00 on CPU
> 76 pcrewrap_extract_captures                     ok 0:00, 0:00 on CPU
> 77 pcrewrap_simple_match                         ok 0:00, 0:00 on CPU
> 78 refiner_count_0_1                             ok 0:00, 0:00 on CPU
> 35 graph_get_uncommon_ancestors_randomly         ok 0:07, 0:05 on CPU
> 81 restrictions_empty_restriction                ok 0:00, 0:00 on CPU
> 82 restrictions_exclude_include                  ok 0:00, 0:00 on CPU
> 83 restrictions_ignored_invalid_workspace_paths  ok 0:00, 0:00 on CPU
> 84 restrictions_include_depth_0                  ok 0:00, 0:00 on CPU
> 85 restrictions_include_depth_1                  ok 0:00, 0:00 on CPU
> 86 restrictions_include_depth_1_empty_restriction ok 0:00, 0:00 on CPU
> 88 restrictions_include_exclude                  ok 0:00, 0:00 on CPU
> 87 restrictions_include_depth_2                  ok 0:00, 0:00 on CPU
> 90 restrictions_invalid_workspace_paths          ok 0:00, 0:00 on CPU
> 89 restrictions_invalid_roster_paths             ok 0:00, 0:00 on CPU
>  4 (minor)_add_own_db                            ok 0:14, 0:00 on CPU
>  5 (minor)_drop_in_subdir                        ok 0:16, 0:00 on CPU
>  8 (minor)_update_cleans_emptied_directories     ok 0:16, 0:00 on CPU
> 11 (normal)_update_across_discontinuity          ok 0:16, 0:00 on CPU
> 91 restrictions_simple_exclude                   ok 0:00, 0:00 on CPU
> 92 restrictions_simple_include                   ok 0:00, 0:00 on CPU
> 94 rev_height_comparisons                        ok 0:00, 0:00 on CPU
> 23 _MTN_case-folding_security_patch              FAIL (line 2) 0:03, 0:00 on CPU
> 95 rev_height_count_up                           ok 0:00, 0:00 on CPU
> 93 rev_height_children                           ok 0:00, 0:00 on CPU
> 96 revision_from_network                         ok 0:00, 0:00 on CPU
> 97 roster_all_0_scalar_parent_mark_scenarios     ok 0:01, 0:00 on CPU
> 98 roster_all_1_scalar_parent_mark_scenarios     ok 0:00, 0:00 on CPU
> 22 _--rcfile_requires_extant_file                ok 0:05, 0:00 on CPU
> 99 roster_all_2_scalar_parent_mark_scenarios     ok 0:00, 0:00 on CPU
> 80 refiner_count_128                             ok 0:05, 0:04 on CPU
>100 roster_bad_attr                               ok 0:00, 0:00 on CPU
>101 roster_check_sane_against                     ok 0:01, 0:00 on CPU
>102 roster_check_sane_roster                      ok 0:00, 0:00 on CPU
>103 roster_check_sane_roster_loop                 ok 0:00, 0:00 on CPU
>104 roster_check_sane_roster_screwy_dir_map       ok 0:00, 0:00 on CPU
>  2 (imp)_merge((patch_foo_a),_(delete_foo_))     ok 0:21, 0:00 on CPU
> 21 _--rcfile=directory                           ok 0:08, 0:00 on CPU
>105 roster_die_die_die_merge                      ok 0:00, 0:00 on CPU
>  5 cluster-push                                  skipped (line 1) 0:00, 0:00 on CPU
>  4 ciabot                                        skipped (line 1) 0:00, 0:00 on CPU
>  8 mail-notify                                   skipped (line 1) 0:00, 0:00 on CPU
>  3 buildbot                                      skipped (line 1) 0:00, 0:00 on CPU
>  7 dump-test-logs                                ok 0:00, 0:00 on CPU
>  6 cvs-ignore                                    ok 0:07, 0:00 on CPU
> 10 passphrase-from-file                          ok 0:11, 0:00 on CPU
>  9 mtn-cleanup                                   expected failure (line 23) 0:13, 0:00 on CPU
>  2 bash_completion                               ok 0:21, 0:00 on CPU
>Of 10 tests run:
>	4 succeeded
>	0 failed
>	1 had expected failures
>	0 succeeded unexpectedly
>	5 were skipped
>107 roster_residual_attr_mark_scenario            ok 0:00, 0:00 on CPU
> 20 _--rcfile=-                                   ok 0:09, 0:00 on CPU
> 19 _--no-workspace                               ok 0:09, 0:00 on CPU
>109 roster_unify_rosters_end_to_end_attr_corpses  ok 0:00, 0:00 on CPU
>108 roster_same_nid_diff_type                     ok 0:00, 0:00 on CPU
>110 roster_unify_rosters_end_to_end_ids           ok 0:00, 0:00 on CPU
>111 roster_unify_rosters_randomized_tempids       ok 0:01, 0:00 on CPU
>112 roster_unify_rosters_randomized_trueids       ok 0:00, 0:00 on CPU
>113 roster_write_roster                           ok 0:00, 0:00 on CPU
> 29 add_ignored                                   ok 0:07, 0:00 on CPU
> 24 _MTN_files_handled_correctly_in_aborted_commit ok 0:10, 0:00 on CPU
> 30 add_ignores__MTN                              ok 0:06, 0:00 on CPU
>114 sha1_long_message                             ok 0:00, 0:00 on CPU
>116 sha1_short_message                            ok 0:00, 0:00 on CPU
>117 simplestring_xform_caseconv                   ok 0:00, 0:00 on CPU
>118 simplestring_xform_join_lines                 ok 0:00, 0:00 on CPU
>115 sha1_pseudo_message                           ok 0:00, 0:00 on CPU
> 34 add_unknown_recursive                         FAIL (line 2) 0:01, 0:00 on CPU
>119 simplestring_xform_join_words                 ok 0:00, 0:00 on CPU
> 32 add_inside__MTN_                              ok 0:02, 0:00 on CPU
> 27 add_and_then_drop_file_does_nothing           ok 0:07, 0:00 on CPU
>120 simplestring_xform_split_into_words           ok 0:00, 0:00 on CPU
>121 simplestring_xform_trimming                   ok 0:00, 0:00 on CPU
>122 string_queue_basic                            ok 0:00, 0:00 on CPU
>123 transforms_calculate_ident                    ok 0:00, 0:00 on CPU
>124 transforms_corruption_check                   ok 0:00, 0:00 on CPU
>125 transforms_enc                                ok 0:00, 0:00 on CPU
>126 uri_basic                                     ok 0:00, 0:00 on CPU
>127 uri_bizarre                                   ok 0:00, 0:00 on CPU
>128 uri_invalid                                   ok 0:00, 0:00 on CPU
>129 uri_urldecode                                 ok 0:00, 0:00 on CPU
> 28 add_executable                                ok 0:07, 0:00 on CPU
> 31 add_in_subdir                                 ok 0:03, 0:00 on CPU
> 25 _MTN_revision_is_required                     ok 0:11, 0:00 on CPU
> 33 add_unknown_ignored                           ok 0:03, 0:00 on CPU
> 35 add_unknown_recursive_ignored                 ok 0:02, 0:00 on CPU
> 26 add,remove,cleanup_registered_workspaces      ok 0:09, 0:00 on CPU
>  1 (imp)_deleting_directories                    ok 0:26, 0:00 on CPU
> 37 addition_of_files_and_directories             ok 0:03, 0:00 on CPU
> 43 annotate_ignores_untrusted_certs              ok 0:03, 0:00 on CPU
> 36 add_workspace_commit_in_another               expected failure (line 34) 0:04, 0:00 on CPU
> 40 annotate_file_added_on_different_forks        expected failure (line 27) 0:04, 0:00 on CPU
> 48 annotate_with_no_revs                         ok 0:02, 0:00 on CPU
> 41 annotate_file_on_multirooted_branch           expected failure (line 32) 0:04, 0:00 on CPU
> 47 annotate_with_human_output                    ok 0:03, 0:00 on CPU
> 44 annotate_where_line_splits                    ok 0:05, 0:00 on CPU
> 51 attr_init_functions                           ok 0:03, 0:00 on CPU
> 50 attr_drop                                     ok 0:04, 0:00 on CPU
> 45 annotate_where_lineage_depends_on_traversal   ok 0:06, 0:00 on CPU
> 46 annotate_where_one_parent_is_full_copy        ok 0:06, 0:00 on CPU
> 42 annotate_file_whose_name_changed              ok 0:07, 0:00 on CPU
> 53 attr_set_attr_get                             ok 0:04, 0:00 on CPU
> 49 attr_command_in_subdirs                       ok 0:05, 0:00 on CPU
> 54 attr_set_drop                                 ok 0:03, 0:00 on CPU
> 39 annotate_accidental_clean_merge               ok 0:09, 0:00 on CPU
> 62 automate_commands_are_not_completed           ok 0:03, 0:00 on CPU
> 38 alias_command                                 ok 0:11, 0:00 on CPU
> 58 automate_branches                             ok 0:06, 0:00 on CPU
> 60 automate_certs                                ok 0:06, 0:00 on CPU
> 59 automate_cert                                 ok 0:08, 0:00 on CPU
> 55 attr_set_get_commands                         ok 0:11, 0:00 on CPU
> 61 automate_checkout                             ok 0:09, 0:00 on CPU
> 64 automate_content_diff                         ok 0:09, 0:00 on CPU
> 52 attr_mtn_execute                              ok 0:14, 0:00 on CPU
> 65 automate_db_variables                         ok 0:11, 0:00 on CPU
> 56 automate_ancestors                            ok 0:14, 0:00 on CPU
> 71 automate_get_base_revision_id                 ok 0:04, 0:00 on CPU
> 57 automate_ancestry_difference                  ok 0:14, 0:00 on CPU
> 72 automate_get_content_changed                  ok 0:04, 0:00 on CPU
> 68 automate_file_merge                           ok 0:09, 0:00 on CPU
> 70 automate_get_attributes                       ok 0:07, 0:00 on CPU
> 74 automate_get_current_revision                 ok 0:05, 0:00 on CPU
> 80 automate_get_options                          ok 0:01, 0:00 on CPU
> 63 automate_common_ancestors                     ok 0:15, 0:00 on CPU
> 69 automate_generate_key                         ok 0:11, 0:00 on CPU
> 66 automate_descendents                          ok 0:14, 0:00 on CPU
> 67 automate_erase_ancestors                      ok 0:12, 0:00 on CPU
> 75 automate_get_current_revision_id              ok 0:04, 0:00 on CPU
> 79 automate_get_manifest_of                      ok 0:04, 0:00 on CPU
> 73 automate_get_corresponding_path               ok 0:07, 0:00 on CPU
> 82 automate_get_workspace_root                   ok 0:02, 0:00 on CPU
> 77 automate_get_file,_automate_get_file_of       ok 0:07, 0:00 on CPU
> 81 automate_get_revision                         ok 0:05, 0:00 on CPU
> 86 automate_interface_version                    ok 0:04, 0:00 on CPU
> 78 automate_get_file_size                        ok 0:08, 0:00 on CPU
> 96 automate_netsync                              skipped (line 11) 0:00, 0:00 on CPU
> 97 automate_netsync_dryrun                       skipped (line 6) 0:00, 0:00 on CPU
> 76 automate_get_extended_manifest_of             ok 0:09, 0:00 on CPU
> 88 automate_inventory_ignore_dirs                ok 0:05, 0:00 on CPU
> 85 automate_identify                             ok 0:05, 0:00 on CPU
> 91 automate_key_manage                           ok 0:06, 0:00 on CPU
> 95 automate_lua                                  ok 0:03, 0:00 on CPU
> 92 automate_keys                                 ok 0:06, 0:00 on CPU
> 89 automate_inventory_options                    ok 0:08, 0:00 on CPU
> 90 automate_inventory_restricted                 ok 0:09, 0:00 on CPU
> 99 automate_put_file                             ok 0:04, 0:00 on CPU
> 83 automate_graph                                ok 0:11, 0:00 on CPU
>102 automate_put_revision_unknown_file            ok 0:03, 0:00 on CPU
> 84 automate_heads                                ok 0:11, 0:00 on CPU
> 93 automate_leaves                               ok 0:08, 0:00 on CPU
>105 automate_set_drop_attribute                   ok 0:03, 0:00 on CPU
>101 automate_put_revision_for_merge               ok 0:07, 0:00 on CPU
> 94 automate_log                                  ok 0:10, 0:00 on CPU
>108 automate_stdio                                ok 0:03, 0:00 on CPU
>104 automate_select                               ok 0:06, 0:00 on CPU
>100 automate_put_revision                         ok 0:08, 0:00 on CPU
> 98 automate_parents,_automate_children           ok 0:09, 0:00 on CPU
>103 automate_roots                                ok 0:07, 0:00 on CPU
>109 automate_stdio_band_output                    ok 0:04, 0:00 on CPU
>110 automate_stdio_options                        ok 0:03, 0:00 on CPU
>115 b_t_and_a_selector_globbing                   FAIL (line 3) 0:01, 0:00 on CPU
>111 automate_tags                                 ok 0:04, 0:00 on CPU
>117 bad_packet_args                               ok 0:02, 0:00 on CPU
>123 branch_handling_in_disapprove                 expected failure (line 16) 0:02, 0:00 on CPU
>107 automate_show_conflicts_defaults              ok 0:07, 0:00 on CPU
>130 vocab_verify_hexenc_id                        ok 0:00, 0:00 on CPU
> 79 refiner_count_1024                            ok 0:46, 0:36 on CPU
>106 roster_random_actions                         ok 0:42, 0:41 on CPU
>Of 130 tests run:
>	130 succeeded
>	0 failed
>	0 had expected failures
>	0 succeeded unexpectedly
>	0 were skipped
>118 basic_invocation_and_options                  ok 0:04, 0:00 on CPU
>114 b_and_h_selectors                             ok 0:05, 0:00 on CPU
>122 branch-based_checkout                         ok 0:04, 0:00 on CPU
> 87 automate_inventory                            ok 0:18, 0:01 on CPU
>126 calculation_of_unidiffs                       ok 0:02, 0:00 on CPU
>112 automate_toposort                             ok 0:07, 0:01 on CPU
>125 calculation_of_other_unidiffs                 ok 0:04, 0:00 on CPU
>113 automate_update                               ok 0:07, 0:00 on CPU
>116 bad_and_unknown_certs                         ok 0:06, 0:00 on CPU
>131 catch_lua_output                              ok 0:01, 0:00 on CPU
>121 bisect_linear                                 FAIL (line 20) 0:06, 0:00 on CPU
>128 can_execute_things                            ok 0:03, 0:00 on CPU
>127 calculation_of_unidiffs_start_of_file         ok 0:03, 0:00 on CPU
>133 change_workspace                              ok 0:02, 0:00 on CPU
>141 checking_that_certain_commands_ignores_the_contents_of__MTN_options skipped (line 2) 0:00, 0:00 on CPU
>129 cancelled_arguments                           ok 0:04, 0:00 on CPU
>132 cert_no_branch                                ok 0:05, 0:00 on CPU
>136 check_--log                                   ok 0:04, 0:00 on CPU
>140 checking_a_few_command_specific_options       FAIL (line 2) 0:03, 0:00 on CPU
>147 checkout_in_windows_root                      skipped (line 3) 0:00, 0:00 on CPU
>130 cat_-r_REV_PATH                               ok 0:05, 0:00 on CPU
>139 check_that_--xargs_and_-(at)_behave_correctly ok 0:03, 0:00 on CPU
>120 bisect_blocked                                ok 0:09, 0:00 on CPU
>143 checkout_creates__MTN_log                     ok 0:04, 0:00 on CPU
>135 changing_passphrase_of_a_private_key          ok 0:06, 0:03 on CPU
>138 check_same_db_contents_macro                  ok 0:06, 0:00 on CPU
>150 clobbered_attrs                               ok 0:03, 0:00 on CPU
>142 checkout_-r_no_dir                            ok 0:06, 0:00 on CPU
>137 check_later_and_earlier_selectors             ok 0:07, 0:00 on CPU
>145 checkout_does_not_clobber_workspace           ok 0:03, 0:00 on CPU
>148 checkout_validates_target_directory           ok 0:04, 0:00 on CPU
>146 checkout_fails_with_multiple_heads            ok 0:04, 0:00 on CPU
>149 checkout_without_--branch_sets_branch         ok 0:06, 0:00 on CPU
>144 checkout_creates_right__MTN_options           ok 0:08, 0:00 on CPU
>159 commit_default_editor                         ok 0:04, 0:00 on CPU
>151 clone_aborts_on_branch_pattern_in_uri         ok 0:08, 0:00 on CPU
>161 commit_use_workspace_keydir                   ok 0:03, 0:00 on CPU
>124 branch_leaves_sync_bug                        ok 0:17, 0:01 on CPU
>134 changelog_editor                              ok 0:14, 0:00 on CPU
>153 clone_creates__MTN_log                        ok 0:08, 0:00 on CPU
>162 commit_using__MTN_log                         ok 0:02, 0:00 on CPU
>155 clone_validates_target_directory              ok 0:07, 0:00 on CPU
>163 commit_using__MTN_log_and_--message           ok 0:02, 0:00 on CPU
>170 creating_a_bad_criss-cross_merge              FAIL (line 2) 0:01, 0:00 on CPU
>157 clone_weird_branch_names                      ok 0:08, 0:00 on CPU
>164 commit_w_o__MTN_log_being_present             ok 0:03, 0:00 on CPU
>152 clone_branch_no_dir                           ok 0:11, 0:00 on CPU
>168 complete_option_names                         ok 0:03, 0:00 on CPU
>160 commit_update_multiple_heads_message          ok 0:09, 0:00 on CPU
>166 commit_writes_message_back_to__MTN_log        ok 0:03, 0:00 on CPU
>158 command_completion                            ok 0:10, 0:00 on CPU
>156 clone_warning_with_multiple_heads             ok 0:11, 0:00 on CPU
>167 committing_with_a_non-english_message         ok 0:06, 0:00 on CPU
>165 commit_with_--message-file                    ok 0:06, 0:00 on CPU
>173 creating_a_fork_and_updating                  ok 0:05, 0:00 on CPU
>175 database_aliases                              ok 0:03, 0:00 on CPU
>178 date_formatting                               ok 0:04, 0:00 on CPU
>172 creating_a_fork_and_merging                   ok 0:07, 0:00 on CPU
>171 creating_a_fork                               ok 0:09, 0:00 on CPU
>174 creating_a_good_and_bad_test_result           ok 0:06, 0:00 on CPU
>186 db_info_of_new_database                       ok 0:02, 0:00 on CPU
>183 db_data_format_checking                       ok 0:04, 0:00 on CPU
>154 clone_creates_right__MTN_options              ok 0:18, 0:00 on CPU
>184 db_execute                                    ok 0:03, 0:00 on CPU
>179 db_check_(heights)                            ok 0:08, 0:00 on CPU
>177 database_dump_load                            ok 0:09, 0:01 on CPU
>180 db_check_and_non-serious_errors               ok 0:08, 0:00 on CPU
>192 db_missing                                    ok 0:02, 0:00 on CPU
>182 db_check_file_sizes                           ok 0:06, 0:00 on CPU
>193 db_opt_fallback_mechanisms                    skipped (line 12) 0:01, 0:00 on CPU
>185 db_fix_certs                                  ok 0:07, 0:00 on CPU
>191 db_load_must_create_a_new_db                  ok 0:04, 0:00 on CPU
>200 delta_directions                              skipped (line 1) 0:00, 0:00 on CPU
>195 db_rosterify_preserves_renames                ok 0:03, 0:00 on CPU
>194 db_rosterify_on_a_db_with_a_root_suture       ok 0:03, 0:00 on CPU
>189 db_kill_rev_locally_and_recommit              ok 0:05, 0:00 on CPU
>197 default_command_options                       ok 0:04, 0:00 on CPU
>201 diagnostics_with--timestamps                  ok 0:02, 0:00 on CPU
>181 db_check_branch_leaves                        ok 0:10, 0:00 on CPU
>196 db_rosterify_twice_gives_an_error_second_time ok 0:04, 0:00 on CPU
>188 db_kill_rev_locally                           ok 0:07, 0:00 on CPU
>119 bisect                                        ok 0:35, 0:02 on CPU
>199 delete_work_file_on_checkout                  ok 0:02, 0:00 on CPU
>190 db_kill_rev_locally_workspace                 ok 0:07, 0:00 on CPU
>198 defecting_attributes                          ok 0:04, 0:00 on CPU
>176 database_check                                ok 0:14, 0:00 on CPU
>206 diff_in_a_never-committed_project             ok 0:01, 0:00 on CPU
>204 diff_a_binary_file                            ok 0:02, 0:00 on CPU
>210 diff_patch_add                                ok 0:02, 0:00 on CPU
>205 diff_against_empty_file                       ok 0:02, 0:00 on CPU
>202 diff_--external                               ok 0:03, 0:00 on CPU
>207 diff_on_missing_trailing_newline_at_end_of_file ok 0:02, 0:00 on CPU
>187 db_kill_certs_locally                         ok 0:09, 0:00 on CPU
>203 diff_-rREV1_-rREV2_UNCHANGED-FILE             ok 0:04, 0:00 on CPU
>211 diff_patch_drop                               ok 0:03, 0:00 on CPU
>208 diff_order                                    ok 0:04, 0:00 on CPU
>212 diff_patch_rename                             ok 0:04, 0:00 on CPU
>215 diff_reverse                                  ok 0:04, 0:00 on CPU
>216 diff_shows_renames                            ok 0:03, 0:00 on CPU
>213 diff_respects_restrictions                    ok 0:04, 0:00 on CPU
>219 diffing_with_explicit_rev_same_as_wc_rev      ok 0:03, 0:00 on CPU
>220 disallowing_persistence_of_passphrase         ok 0:04, 0:00 on CPU
>218 diffing_a_revision_with_an_added_file         ok 0:04, 0:00 on CPU
>214 diff_restriction_renamed_parent               ok 0:05, 0:00 on CPU
>221 disapproving_a_non_head                       ok 0:04, 0:00 on CPU
>217 diffing_a_file_within_revision_outside_a_workspace ok 0:05, 0:00 on CPU
>225 disapproving_of_bad_revision_range            ok 0:03, 0:00 on CPU
>227 do_not_log_the_result_of_hook_get_passphrase  ok 0:04, 0:00 on CPU
>229 drop_a_public_key                             ok 0:04, 0:00 on CPU
>228 drop_a_public_and_private_key                 ok 0:04, 0:00 on CPU
>233 drop_root                                     ok 0:02, 0:00 on CPU
>226 disapproving_with_message                     ok 0:04, 0:00 on CPU
>222 disapproving_of_a_merge_revision              ok 0:07, 0:00 on CPU
>231 drop_missing_and_unknown_files                ok 0:04, 0:00 on CPU
>232 drop_removes_attributes                       ok 0:04, 0:00 on CPU
>223 disapproving_of_a_revision                    ok 0:07, 0:00 on CPU
>244 exchanging_work_via_netsync                   skipped (line 2) 0:00, 0:00 on CPU
>245 exchanging_work_via_netsync,_with_notes       skipped (line 2) 0:00, 0:00 on CPU
>246 exchanging_work_via_netsync_sent_notes        skipped (line 7) 0:00, 0:00 on CPU
>238 empty_command_name                            ok 0:01, 0:00 on CPU
>236 dump_private_key                              ok 0:01, 0:00 on CPU
>230 drop_directory_with_unversioned_files_and_update ok 0:04, 0:00 on CPU
>224 disapproving_of_a_revision_range              ok 0:07, 0:00 on CPU
>239 empty_environment                             ok 0:02, 0:00 on CPU
>240 empty_id_completion                           ok 0:01, 0:00 on CPU
>243 exception-in-luaext                           ok 0:02, 0:00 on CPU
>237 duplicate_key_id                              ok 0:03, 0:00 on CPU
>251 fail_cleanly_on_unreadable__MTN_options       ok 0:02, 0:00 on CPU
>250 external_unit_test_of_the_line_merger         ok 0:03, 0:00 on CPU
>254 failed_checkout_is_a_no-op                    ok 0:02, 0:00 on CPU
>242 escaped_selectors                             ok 0:04, 0:00 on CPU
>241 empty_string_as_a_path_name                   ok 0:04, 0:00 on CPU
>235 dump_on_crash                                 ok 0:05, 0:00 on CPU
>253 fail_cleanly_when__MTN_format_corrupt         ok 0:03, 0:00 on CPU
>248 explicit_merge_LEFT_RIGHT_ANC_BRANCH          expected failure (line 26) 0:05, 0:00 on CPU
>262 get_netsync_read_permitted                    skipped (line 2) 0:00, 0:00 on CPU
>263 git_export                                    skipped (line 1) 0:00, 0:00 on CPU
>265 git_export_rename_loop                        skipped (line 1) 0:00, 0:00 on CPU
>255 fetching_nonexistent_entry_from_children_bug  ok 0:03, 0:00 on CPU
>256 filenames_in_diff_after_removal               ok 0:03, 0:00 on CPU
>259 files_with_spaces_at_the_end                  ok 0:02, 0:00 on CPU
>257 filenames_in_diff_after_rename                ok 0:02, 0:00 on CPU
>247 explicit_merge                                ok 0:06, 0:00 on CPU
>260 first_extent_normalization_pass               ok 0:03, 0:00 on CPU
>264 git_export_invalid_mapped_author              ok 0:02, 0:00 on CPU
>209 diff_output_formats                           ok 0:18, 0:02 on CPU
>269 i18n_commit_messages                          ok 0:03, 0:00 on CPU
>249 extended-selectors                            ok 0:09, 0:00 on CPU
>266 git_export_unmapped_authors                   ok 0:04, 0:00 on CPU
>252 fail_cleanly_on_unreadable_db                 ok 0:09, 0:00 on CPU
>273 importing_a_file                              ok 0:03, 0:00 on CPU
>268 heads_with_discontinuous_branches             ok 0:05, 0:00 on CPU
>270 i_selector                                    ok 0:05, 0:00 on CPU
>271 imp_test_filesync_confdir                     ok 0:05, 0:00 on CPU
>276 importing_cvs_file_added_on_a_branch          ok 0:03, 0:00 on CPU
>234 drop_with_actual_removal                      ok 0:15, 0:01 on CPU
>258 files_with_intermediate__MTN_path_elements    ok 0:09, 0:00 on CPU
>277 importing_cvs_file_dead_on_head_and_branch    ok 0:04, 0:00 on CPU
>278 importing_cvs_file_with_one_version           ok 0:03, 0:00 on CPU
>287 in_memory_database                            skipped (line 1) 0:00, 0:00 on CPU
>281 importing_cvs_metadata                        ok 0:02, 0:00 on CPU
>274 importing_cvs_branches                        expected failure (line 54) 0:06, 0:00 on CPU
>282 importing_cvs_problematic_repo                expected failure (line 13) 0:02, 0:00 on CPU
>261 generating_and_extracting_keys_and_certs      ok 0:11, 0:01 on CPU
>267 heads                                         ok 0:10, 0:00 on CPU
>275 importing_cvs_deleted_file                    ok 0:07, 0:00 on CPU
>288 include()_includedir()_and_includedirpattern()_lua_functions ok 0:03, 0:00 on CPU
>283 importing_cvs_small_real_repo                 ok 0:04, 0:00 on CPU
>280 importing_cvs_files_with_identical_logs       ok 0:05, 0:00 on CPU
>279 importing_cvs_files                           ok 0:06, 0:00 on CPU
>284 importing_cvs_tricky_repo_with_tags           ok 0:05, 0:00 on CPU
>290 invalid_--root_settings                       ok 0:03, 0:00 on CPU
>285 importing_cvs_with_vendor_imports_and_branches ok 0:04, 0:00 on CPU
>291 invalid__MTN_options                          ok 0:03, 0:00 on CPU
>292 invoke_subcommands                            ok 0:01, 0:00 on CPU
>293 invoke_toplevel_group                         ok 0:01, 0:00 on CPU
>299 keydir_defaults_to_under_confdir              ok 0:02, 0:00 on CPU
>296 key_files_created_securely                    ok 0:03, 0:00 on CPU
>302 list_databases                                ok 0:02, 0:00 on CPU
>304 list_workspaces                               ok 0:02, 0:00 on CPU
>297 key_files_deleted_securely                    ok 0:04, 0:00 on CPU
>305 listing_changed_files                         FAIL (line 2) 0:01, 0:00 on CPU
>303 list_missing_files                            ok 0:03, 0:00 on CPU
>295 keep_valid_workspace_options_on_error         ok 0:05, 0:00 on CPU
>301 list_branches                                 ok 0:04, 0:00 on CPU
>286 importing_files_with_non-english_names        ok 0:08, 0:00 on CPU
>294 k_selector                                    ok 0:05, 0:00 on CPU
>298 key_management_without_a_database             ok 0:06, 0:00 on CPU
>306 listing_workspace_manifests                   ok 0:03, 0:00 on CPU
>300 largish_file                                  ok 0:06, 0:01 on CPU
>307 locked_workspace                              ok 0:04, 0:00 on CPU
>308 log_--brief                                   ok 0:04, 0:00 on CPU
>314 log_and_selectors_returning_multiple_rids     ok 0:03, 0:00 on CPU
>321 log_with_windows_dirsep                       skipped (line 4) 0:00, 0:00 on CPU
>311 log_--last=N_FILENAME                         ok 0:05, 0:00 on CPU
>272 import                                        ok 0:18, 0:00 on CPU
>310 log_--last=N_--next=N                         ok 0:06, 0:00 on CPU
>319 log_recognizes_invalid_workspace_parent       ok 0:03, 0:00 on CPU
>309 log_--diffs                                   ok 0:06, 0:00 on CPU
>312 log_--no-files_and_--merges                   ok 0:05, 0:00 on CPU
>318 log_quits_on_SIGPIPE                          ok 0:04, 0:00 on CPU
>313 log_--to                                      ok 0:06, 0:00 on CPU
>322 logging_a_file_within_revision_outside_a_workspace ok 0:02, 0:00 on CPU
>289 inodeprints                                   ok 0:14, 0:00 on CPU
>329 ls_unknown_in_subdir                          ok 0:02, 0:00 on CPU
>323 ls_changed_respects_path_masks                ok 0:04, 0:00 on CPU
>315 log_dir                                       ok 0:08, 0:00 on CPU
>317 log_hides_deleted_renamed_files               ok 0:07, 0:00 on CPU
>330 ls_unknown_of_unknown_subdir                  ok 0:02, 0:00 on CPU
>331 lua_function_existsonpath                     ok 0:02, 0:00 on CPU
>334 manifest_restrictions                         FAIL (line 2) 0:00, 0:00 on CPU
>335 manpage                                       ok 0:01, 0:00 on CPU
>316 log_from_to_revision                          ok 0:08, 0:00 on CPU
>328 ls_tags_with_ambiguous_tags                   ok 0:04, 0:00 on CPU
>326 ls_duplicates_without_duplicates              ok 0:05, 0:00 on CPU
>327 ls_epochs                                     ok 0:05, 0:00 on CPU
>333 magic__MTN_in_restrictions                    ok 0:02, 0:00 on CPU
>324 ls_duplicates_with_duplicates                 ok 0:07, 0:00 on CPU
>332 m_selector                                    ok 0:04, 0:00 on CPU
>325 ls_duplicates_with_workspace                  ok 0:07, 0:00 on CPU
>336 merge((),_(add_a,_drop_a,_add_a))             ok 0:06, 0:00 on CPU
>349 merge_conflict_with_no_lca                    skipped (line 2) 0:00, 0:00 on CPU
>343 merge((patch_a),_(drop_a))                    ok 0:05, 0:00 on CPU
>338 merge((),_(drop_a,_rename_b_a,_patch_a))      ok 0:07, 0:00 on CPU
>320 log_with_restriction                          ok 0:12, 0:01 on CPU
>341 merge((drop_a),_(drop_a,_add_a))              ok 0:06, 0:00 on CPU
>346 merge((rename_a_b),_(rename_a_c))             ok 0:04, 0:00 on CPU
>345 merge((patch_foo_a),_(rename_foo__bar_))      ok 0:06, 0:00 on CPU
>342 merge((drop_a),_(rename_a_b,_patch_b))        ok 0:06, 0:00 on CPU
>339 merge((),_(patch_a,_drop_a,_add_a))           ok 0:08, 0:00 on CPU
>344 merge((patch_a),_(drop_a,_add_a))             ok 0:06, 0:00 on CPU
>340 merge((add_a),_(add_a,_drop_a,_add_a))        expected failure (line 37) 0:08, 0:00 on CPU
>337 merge((),_(add_a,_patch_a,_drop_a,_add_a))    ok 0:09, 0:00 on CPU
>348 merge_a_project_into_a_subdirectory_of_an_unrelated_project ok 0:05, 0:00 on CPU
>347 merge_--update                                ok 0:07, 0:00 on CPU
>106 automate_show_conflicts                       ok 1:29, 0:07 on CPU
>355 merge_into_workspace_same_rev                 ok 0:03, 0:00 on CPU
>358 merge_normalization_edge_case                 ok 0:04, 0:00 on CPU
>353 merge_into_workspace_mtn_execute              ok 0:05, 0:00 on CPU
>360 merge_rev_with_ancestor                       ok 0:04, 0:00 on CPU
>361 merge_update_part_of_file                     expected failure (line 46) 0:04, 0:00 on CPU
>352 merge_into_workspace_files_added              ok 0:06, 0:00 on CPU
>359 merge_rename_file_and_rename_dir              ok 0:05, 0:00 on CPU
>350 merge_into_workspace                          ok 0:08, 0:00 on CPU
>357 merge_multiple_heads_1                        ok 0:07, 0:00 on CPU
>354 merge_into_workspace_no_changes               ok 0:08, 0:00 on CPU
>351 merge_into_workspace_attr_corpse              ok 0:09, 0:00 on CPU
>363 merge_with_conflicting_name_and_renamed_dir   ok 0:06, 0:00 on CPU
>372 migrate_workspace                             ok 0:03, 0:00 on CPU
>365 merging_(add_a,_rename_a_b)_with_(add_b)      ok 0:06, 0:00 on CPU
>362 merge_with_add,_rename_file,_and_rename_dir   ok 0:08, 0:00 on CPU
>368 merging_adds_in_unrelated_revisions           expected failure (line 18) 0:04, 0:00 on CPU
>367 merging_adds                                  ok 0:05, 0:00 on CPU
>169 conflict_messages                             FAIL (line 756) 1:13, 0:08 on CPU
>373 missing_empty_dir                             ok 0:03, 0:00 on CPU
>383 netsync,--exclude,defaults                    skipped (line 2) 0:00, 0:00 on CPU
>384 netsync,--set-default                         skipped (line 2) 0:00, 0:00 on CPU
>371 merging_data_in_unrelated_revisions           expected failure (line 19) 0:04, 0:00 on CPU
>386 netsync_bind_opt                              skipped (line 1) 0:00, 0:00 on CPU
>387 netsync_client_absorbs_and_checks_epochs      skipped (line 2) 0:00, 0:00 on CPU
>388 netsync_client_absorbs_server_key             skipped (line 2) 0:00, 0:00 on CPU
>389 netsync_default_server_pattern                skipped (line 2) 0:00, 0:00 on CPU
>390 netsync_default_server_pattern_setting        skipped (line 2) 0:00, 0:00 on CPU
>391 netsync_dry_run                               skipped (line 1) 0:00, 0:00 on CPU
>392 netsync_duplicate_keys                        skipped (line 2) 0:00, 0:00 on CPU
>393 netsync_epoch_refinement                      skipped (line 1) 0:00, 0:00 on CPU
>394 netsync_epochs_are_not_sent_upstream_by_pull  skipped (line 2) 0:00, 0:00 on CPU
>395 netsync_hook_errcodes                         skipped (line 2) 0:00, 0:00 on CPU
>396 netsync_is_not_interrupted_by_SIGPIPE         skipped (line 3) 0:00, 0:00 on CPU
>397 netsync_key_hooks                             skipped (line 2) 0:00, 0:00 on CPU
>398 netsync_largish_file                          skipped (line 2) 0:00, 0:00 on CPU
>399 netsync_mtn_uri_scheme                        skipped (line 2) 0:00, 0:00 on CPU
>400 netsync_negotiation                           skipped (line 1) 0:00, 0:00 on CPU
>374 mkdir                                         ok 0:03, 0:00 on CPU
>402 netsync_per_server_defaults                   skipped (line 1) 0:00, 0:00 on CPU
>403 netsync_permissions                           skipped (line 2) 0:00, 0:00 on CPU
>404 netsync_permissions_wildcards                 skipped (line 2) 0:00, 0:00 on CPU
>405 netsync_server_absorbs_and_checks_epochs      skipped (line 2) 0:00, 0:00 on CPU
>406 netsync_stop_server                           skipped (line 1) 0:00, 0:00 on CPU
>407 netsync_transfers_public_keys                 skipped (line 2) 0:00, 0:00 on CPU
>408 netsync_verifies_server_keys                  skipped (line 2) 0:00, 0:00 on CPU
>409 netsync_with_globs                            skipped (line 2) 0:00, 0:00 on CPU
>410 netsync_with_suspended_branch                 skipped (line 2) 0:00, 0:00 on CPU
>369 merging_an_add_edge                           expected failure (line 26) 0:05, 0:00 on CPU
>370 merging_data_in_unrelated_files               expected failure (line 22) 0:05, 0:00 on CPU
>375 modification_of_an_empty_file                 ok 0:03, 0:00 on CPU
>385 netsync_badhost_gives_nice_error              ok 0:02, 0:00 on CPU
>415 one-way_netsync_where_the_sink_has_more_epochs skipped (line 2) 0:00, 0:00 on CPU
>377 mtn_add_dot                                   ok 0:05, 0:00 on CPU
>381 multiple_message_commit                       ok 0:04, 0:00 on CPU
>418 persistent_netsync_server_-_keys              skipped (line 2) 0:00, 0:00 on CPU
>419 persistent_netsync_server_-_revs_&_certs      skipped (line 2) 0:00, 0:00 on CPU
>364 merging_(add_a)_with_(add_a,_drop_a)          ok 0:12, 0:00 on CPU
>421 pid_file_cleanup                              skipped (line 2) 0:00, 0:00 on CPU
>378 mtn_execute_attr_respects_umask               ok 0:05, 0:00 on CPU
>414 normalized_filenames                          ok 0:04, 0:00 on CPU
>380 mtn_up                                        ok 0:06, 0:00 on CPU
>379 mtn_read_FILE                                 ok 0:07, 0:00 on CPU
>416 p_selector                                    ok 0:05, 0:00 on CPU
>412 non_workspace_keydir                          ok 0:07, 0:00 on CPU
>413 noop_merge_into_workspace                     ok 0:08, 0:00 on CPU
>356 merge_manual_file                             ok 0:18, 0:01 on CPU
>420 pid_file_and_log_handles_open_failures        ok 0:04, 0:00 on CPU
>417 persistence_of_passphrase                     ok 0:04, 0:00 on CPU
>430 pluck_restricted                              FAIL (line 1) 0:01, 0:00 on CPU
>431 propagate_a_descendent                        FAIL (line 2) 0:01, 0:00 on CPU
>433 pull_a_netsync_branch_which_has_a_parent_from_another_branch skipped (line 2) 0:00, 0:00 on CPU
>434 quiet_turns_off_tickers_but_not_warnings      skipped (line 2) 0:00, 0:00 on CPU
>436 reallyquiet_turns_off_tickers_and_warnings    skipped (line 2) 0:00, 0:00 on CPU
>376 move_conflicting_unversioned                  ok 0:11, 0:00 on CPU
>366 merging_a_rename_twice                        ok 0:15, 0:01 on CPU
>411 no-change_deltas_disappear                    ok 0:10, 0:00 on CPU
>401 netsync_over_pipes                            ok 0:10, 0:00 on CPU
>423 pivot_root_to_new_dir                         ok 0:06, 0:00 on CPU
>422 pivot_root                                    ok 0:07, 0:00 on CPU
>437 refresh_inodeprints                           ok 0:02, 0:00 on CPU
>424 pluck_basics                                  ok 0:07, 0:00 on CPU
>442 rename_in_new_workspace                       ok 0:02, 0:00 on CPU
>426 pluck_directory_bug_2                         expected failure (line 35) 0:06, 0:00 on CPU
>435 read_and_convert_old_privkey_packet           ok 0:04, 0:00 on CPU
>427 pluck_does_not_clobber_workspace              ok 0:06, 0:00 on CPU
>440 rename_file_to_dir                            ok 0:03, 0:00 on CPU
>425 pluck_directory_bug_1                         expected failure (line 38) 0:08, 0:00 on CPU
>429 pluck_mtn_execute                             ok 0:05, 0:00 on CPU
>438 rename_cannot_overwrite_files                 ok 0:05, 0:00 on CPU
>453 repeatedly_exchanging_work_via_netsync        skipped (line 2) 0:00, 0:00 on CPU
>445 rename_warns_on_subdir_move                   ok 0:02, 0:00 on CPU
>446 rename_with_actual_file_rename                ok 0:03, 0:00 on CPU
>382 multiple_version_committing                   ok 0:15, 0:01 on CPU
>444 rename_moves_attributes                       ok 0:04, 0:00 on CPU
>428 pluck_lifecycle                               ok 0:08, 0:00 on CPU
>443 rename_in_subdir                              ok 0:05, 0:00 on CPU
>432 propagate_an_ancestor                         ok 0:08, 0:02 on CPU
>454 replace_dir_with_file                         ok 0:03, 0:00 on CPU
>449 renaming_a_directory_and_then_adding_a_new_with_the_old_name ok 0:04, 0:00 on CPU
>455 replace_file_with_dir                         ok 0:03, 0:00 on CPU
>447 renaming_a_deleted_file                       ok 0:05, 0:00 on CPU
>439 rename_dir_to_non-sibling                     ok 0:09, 0:00 on CPU
>441 rename_files_into_a_directory                 ok 0:09, 0:00 on CPU
>451 renaming_a_patched_file                       ok 0:06, 0:00 on CPU
>448 renaming_a_directory                          ok 0:07, 0:00 on CPU
>452 renaming_and_editing_a_file                   ok 0:07, 0:00 on CPU
>450 renaming_a_file                               ok 0:08, 0:00 on CPU
>460 resolve_conflicts_duplicate_name_directory    ok 0:06, 0:00 on CPU
>458 resolve_conflicts_content                     ok 0:07, 0:00 on CPU
>456 resolve_conflicts_all_merge_commands          ok 0:07, 0:00 on CPU
>462 resolve_conflicts_multiple_names              ok 0:05, 0:00 on CPU
>463 resolve_conflicts_none                        ok 0:05, 0:00 on CPU
>468 restricted_commit_with_inodeprints            expected failure (line 37) 0:03, 0:00 on CPU
>469 restricted_diff_file_in_renamed_dir           ok 0:02, 0:00 on CPU
>459 resolve_conflicts_duplicate_name              ok 0:06, 0:00 on CPU
>470 restriction_includes_parent_dir               ok 0:04, 0:00 on CPU
>461 resolve_conflicts_errors                      ok 0:08, 0:01 on CPU
>471 restrictions_when_pwd_is_mixed_case           ok 0:03, 0:00 on CPU
>457 resolve_conflicts_all_resolutions             ok 0:10, 0:01 on CPU
>478 revert_directory_blocked_by_unversioned_directory expected failure (line 19) 0:04, 0:00 on CPU
>472 restrictions_with_deletes                     ok 0:04, 0:00 on CPU
>479 revert_directory_blocked_by_unversioned_file  expected failure (line 17) 0:04, 0:00 on CPU
>476 revert_contents_not_parent_rename             ok 0:05, 0:00 on CPU
>465 resolve_conflicts_propagate                   ok 0:08, 0:00 on CPU
>474 revert_--missing_in_subdir                    ok 0:05, 0:00 on CPU
>477 revert_directories                            ok 0:05, 0:00 on CPU
>480 revert_directory_replaced_by_file             expected failure (line 15) 0:03, 0:00 on CPU
>482 revert_file_blocked_by_unversioned_directory  expected failure (line 16) 0:02, 0:00 on CPU
>475 revert_attrs                                  ok 0:06, 0:00 on CPU
>481 revert_drop_not_rename                        ok 0:04, 0:00 on CPU
>484 revert_file_in_new_project                    ok 0:02, 0:00 on CPU
>483 revert_file_blocked_by_unversioned_file       expected failure (line 18) 0:04, 0:00 on CPU
>464 resolve_conflicts_orphaned_file               ok 0:11, 0:01 on CPU
>485 revert_file_replaced_by_directory             expected failure (line 14) 0:03, 0:00 on CPU
>490 revert_renamed_directory_replaced_by_file     expected failure (line 19) 0:03, 0:00 on CPU
>487 revert_ignored_files                          ok 0:03, 0:00 on CPU
>491 revert_renamed_file_replaced_by_directory     expected failure (line 18) 0:03, 0:00 on CPU
>495 revert_uncommitted_execute_attr               expected failure (line 16) 0:01, 0:00 on CPU
>489 revert_moving_a_file_to_a_renamed_directory   ok 0:03, 0:00 on CPU
>467 restricted_commands_are_consistent            ok 0:11, 0:01 on CPU
>493 revert_the_middle_of_a_sequence               expected failure (line 28) 0:02, 0:00 on CPU
>488 revert_in_subdirs                             ok 0:04, 0:00 on CPU
>492 revert_renames                                ok 0:04, 0:00 on CPU
>473 restrictions_with_renames_and_adds            ok 0:10, 0:00 on CPU
>505 schema_migration_bad_schema                   ok 0:02, 0:00 on CPU
>507 schema_migration_new_db                       ok 0:02, 0:00 on CPU
>497 reverting_a_pivot_root                        expected failure (line 43) 0:05, 0:00 on CPU
>511 serve-automate                                skipped (line 1) 0:00, 0:00 on CPU
>512 serve-automate-single-run                     skipped (line 1) 0:00, 0:00 on CPU
>513 serve_pull_with_--exclude                     skipped (line 2) 0:00, 0:00 on CPU
>514 server_initiated_sync                         skipped (line 2) 0:00, 0:00 on CPU
>501 rosterify_on_a_db_with_1_rev                  ok 0:04, 0:00 on CPU
>502 rosterify_on_a_db_with_an_empty_manifest      ok 0:04, 0:00 on CPU
>500 rosterify_migrates_file_dir_attrs             ok 0:05, 0:00 on CPU
>496 revert_works_with_restrictions                ok 0:06, 0:00 on CPU
>503 scanning_trees                                ok 0:05, 0:00 on CPU
>498 rosterify_--drop-attr                         ok 0:06, 0:00 on CPU
>506 schema_migration_error_recovery               ok 0:04, 0:00 on CPU
>509 select_partial_id                             ok 0:04, 0:00 on CPU
>517 setup_creates__MTN_log                        ok 0:01, 0:00 on CPU
>524 single_manifest_netsync                       skipped (line 2) 0:00, 0:00 on CPU
>518 setup_creates_default_db                      ok 0:01, 0:00 on CPU
>515 setup_and_clone_keep_bookkeeping_dir          ok 0:02, 0:00 on CPU
>486 revert_file_to_base_revision                  ok 0:10, 0:01 on CPU
>519 setup_in_subdirectory                         ok 0:02, 0:00 on CPU
>494 revert_unchanged_file_preserves_mtime         ok 0:09, 0:00 on CPU
>526 spawn_pipe                                    ok 0:01, 0:00 on CPU
>520 setup_on_existing_path                        ok 0:03, 0:00 on CPU
>527 sql_function_gunzip_(which_replaced_unpack)   ok 0:02, 0:00 on CPU
>499 rosterify_handles_.mt-ignore_files            ok 0:08, 0:00 on CPU
>521 short_options_work_correctly                  ok 0:03, 0:00 on CPU
>525 skip_invalid_paths                            ok 0:02, 0:00 on CPU
>532 status_with_no_key                            FAIL (line 4) 0:01, 0:00 on CPU
>537 sync_use_ws_opts                              skipped (line 4) 0:00, 0:00 on CPU
>522 signature_round_trip                          ok 0:03, 0:00 on CPU
>536 sync_server_--exclude_foo                     ok 0:02, 0:00 on CPU
>531 status_with_missing_files                     ok 0:03, 0:00 on CPU
>516 setup_checkout_touch_new__MTN_options_only    ok 0:05, 0:00 on CPU
>530 status_with_attrs                             ok 0:03, 0:00 on CPU
>510 selecting_arbitrary_certs                     ok 0:06, 0:00 on CPU
>538 syntax_errors_in_.mtn-ignore                  ok 0:02, 0:00 on CPU
>523 single_character_filename_support             ok 0:06, 0:00 on CPU
>534 subdirectory_restrictions                     ok 0:04, 0:00 on CPU
>528 ssh_agent                                     skipped (line 75) 0:05, 0:00 on CPU
>529 status                                        ok 0:06, 0:00 on CPU
>542 test_a_merge_5                                ok 0:03, 0:00 on CPU
>548 test_some_hook_helper_functions               ok 0:02, 0:00 on CPU
>543 test_a_merge_6                                ok 0:06, 0:00 on CPU
>541 test_a_merge_2                                ok 0:06, 0:00 on CPU
>540 test_a_merge                                  ok 0:06, 0:00 on CPU
>545 test_a_merge_8                                ok 0:05, 0:00 on CPU
>550 test_the_help_command                         ok 0:03, 0:00 on CPU
>551 test_the_version_command                      ok 0:03, 0:00 on CPU
>539 tags_and_tagging_of_revisions                 ok 0:08, 0:00 on CPU
>546 test_a_merge_9                                expected failure (line 30) 0:05, 0:00 on CPU
>552 things_in_.mtn-ignore_get_ignored             ok 0:02, 0:00 on CPU
>549 test_the_approve_command                      ok 0:05, 0:00 on CPU
>561 two_parent_workspace_pivot_root               FAIL (line 1) 0:01, 0:00 on CPU
>544 test_a_merge_7                                ok 0:08, 0:00 on CPU
>535 suspend                                       ok 0:11, 0:00 on CPU
>554 two_parent_workspace_add_drop_rename          ok 0:05, 0:00 on CPU
>556 two_parent_workspace_attrs                    ok 0:05, 0:00 on CPU
>533 sticky_branches                               ok 0:14, 0:00 on CPU
>553 trust_hooks_and_trusted_command               ok 0:06, 0:00 on CPU
>555 two_parent_workspace_annotate                 expected failure (line 32) 0:06, 0:00 on CPU
>547 test_annotate_command                         ok 0:12, 0:00 on CPU
>557 two_parent_workspace_commands_that_fail       ok 0:07, 0:00 on CPU
>563 u_selector                                    ok 0:05, 0:00 on CPU
>566 unnormalized_paths_in_database                ok 0:02, 0:00 on CPU
>560 two_parent_workspace_list                     ok 0:07, 0:00 on CPU
>568 update_-b_switches_branches_even_when_noop    ok 0:04, 0:00 on CPU
>572 update_does_not_suggest_suspended_branches    FAIL (line 3) 0:02, 0:00 on CPU
>562 two_parent_workspace_pluck                    ok 0:07, 0:00 on CPU
>567 update_-b_foo_updates__MTN_options_correctly  ok 0:05, 0:00 on CPU
>575 update_no-ops_when_no_parent_revision         ok 0:01, 0:00 on CPU
>569 update_1                                      ok 0:05, 0:00 on CPU
>576 update_to_non-existent_rev                    ok 0:02, 0:00 on CPU
>565 undrop                                        ok 0:07, 0:00 on CPU
>571 update_does_not_stomp_non-monotone_files      ok 0:05, 0:00 on CPU
>573 update_ignores_suspended_heads                ok 0:05, 0:00 on CPU
>574 update_loses_execute                          ok 0:04, 0:00 on CPU
>570 update_does_not_clobber_workspace             ok 0:06, 0:00 on CPU
>578 update_updates_inodeprints                    ok 0:04, 0:00 on CPU
>564 unchanged_options_preserves_mtime             ok 0:12, 0:00 on CPU
>581 update_with_pending_add                       expected failure (line 18) 0:05, 0:00 on CPU
>583 update_with_pending_modification              expected failure (line 26) 0:04, 0:00 on CPU
>588 usage_output_streams                          ok 0:02, 0:00 on CPU
>582 update_with_pending_drop                      ok 0:05, 0:00 on CPU
>559 two_parent_workspace_inodeprints              ok 0:16, 0:00 on CPU
>584 update_with_pending_rename                    ok 0:04, 0:00 on CPU
>580 update_with_multiple_candidates               ok 0:08, 0:00 on CPU
>579 update_with_blocked_rename                    expected failure (line 41) 0:08, 0:00 on CPU
>586 updating_through_a_pivot_root                 ok 0:05, 0:00 on CPU
>593 util_mtnopt                                   ok 0:02, 0:00 on CPU
>595 validate_commit_message_hook                  FAIL (line 2) 0:00, 0:00 on CPU
>577 update_to_off-branch_rev                      ok 0:09, 0:00 on CPU
>585 updating_from_a_merge_which_adds_a_file       ok 0:06, 0:00 on CPU
>592 user_commands                                 ok 0:03, 0:00 on CPU
>591 use_restrictions_with_--exclude_and_inodeprints ok 0:03, 0:00 on CPU
>594 validate_changes_hook                         ok 0:02, 0:00 on CPU
>587 updating_to_a_given_revision                  ok 0:06, 0:00 on CPU
>600 warn_on_bad_restriction                       ok 0:01, 0:00 on CPU
>597 verbosity                                     ok 0:02, 0:00 on CPU
>598 verification_of_command_line_options          ok 0:02, 0:00 on CPU
>589 use_inodeprints_hook                          ok 0:05, 0:00 on CPU
>590 use_restrictions_with_--exclude               ok 0:05, 0:00 on CPU
>596 vars                                          ok 0:03, 0:00 on CPU
>508 schema_migration_with_rosterify               ok 0:37, 0:08 on CPU
>599 w_selector                                    ok 0:04, 0:00 on CPU
>604 ws_ops_with_wrong_node_type                   ok 0:02, 0:00 on CPU
>603 wrong_options_override_workspace_options      ok 0:03, 0:00 on CPU
>601 warn_on_weird_branch_names                    ok 0:06, 0:00 on CPU
>602 workspace_migration                           ok 0:12, 0:01 on CPU
>504 schema_migration                              ok 0:49, 0:13 on CPU
>558 two_parent_workspace_inodeprint_from_birth    ok 0:35, 0:00 on CPU
>466 resolve_conflicts_read_all                    ok 1:07, 0:07 on CPU
>Of 604 tests run:
>	493 succeeded
>	15 failed
>	37 had expected failures
>	0 succeeded unexpectedly
>	59 were skipped
>============================================================
>1 of 4 test suites failed
>Please report to https://code.monotone.ca/p/monotone/issues/
>make[3]: *** [check-testers] Error 1
>make[3]: Leaving directory `/builddir/build/BUILD/monotone-1.0'
>make[2]: *** [check-am] Error 2
>make[2]: Leaving directory `/builddir/build/BUILD/monotone-1.0'
>make[1]: *** [check-recursive] Error 1
>make[1]: Leaving directory `/builddir/build/BUILD/monotone-1.0'
>make: *** [check] Error 2
>+ head -n-0 test/work/extra.log test/work/func.log test/work/tester.log test/work/tests.log
>==> test/work/extra.log <==
>Running on Linux 3.14.4-200.fc20.x86_64 #1 SMP Tue May 13 13:51:08 UTC 2014 x86_64
>check_net found at /builddir/build/BUILD/monotone-1.0/test/bin/check_net
>warning: DISABLE_NETWORK_TESTS set, skipping network server tests
>mtn found at /builddir/build/BUILD/monotone-1.0/mtn
>warning: DISABLE_NETWORK_TESTS set, skipping network server tests
>monotone 1.0 (base revision: a7c3a1d9de1ba7a62c9dd9efee17252234bb502c)
>Running on          : Linux 3.14.4-200.fc20.x86_64 #1 SMP Tue May 13 13:51:08 UTC 2014 x86_64
>C++ compiler        : GNU C++ version 4.9.0 20140604 (Red Hat 4.9.0-8)
>C++ standard library: GNU libstdc++ version 20140604
>Boost version       : 1_55
>SQLite version      : 3.8.4.3 (compiled against 3.8.4.3)
>Lua version         : Lua 5.2
>PCRE version        : 8.35 2014-04-04 (compiled against 8.35)
>Botan version       : 1.10.8 (compiled against 1.10.8)
>Changes since base revision:
>format_version "1"
>new_manifest [b252820fde344fd3f5d023fd91de86522baa671d]
>old_revision [a7c3a1d9de1ba7a62c9dd9efee17252234bb502c]
>  Generated from data cached in the distribution;
>  further changes may have been made.
>Running tests...
>  1 authorize-remote-automate                     skipped (line 1) 0:00, 0:00 on CPU
>  5 cluster-push                                  skipped (line 1) 0:00, 0:00 on CPU
>  4 ciabot                                        skipped (line 1) 0:00, 0:00 on CPU
>  8 mail-notify                                   skipped (line 1) 0:00, 0:00 on CPU
>  3 buildbot                                      skipped (line 1) 0:00, 0:00 on CPU
>  7 dump-test-logs                                ok 0:00, 0:00 on CPU
>  6 cvs-ignore                                    ok 0:07, 0:00 on CPU
> 10 passphrase-from-file                          ok 0:11, 0:00 on CPU
>  9 mtn-cleanup                                   expected failure (line 23) 0:13, 0:00 on CPU
>  2 bash_completion                               ok 0:21, 0:00 on CPU
>Of 10 tests run:
>	4 succeeded
>	0 failed
>	1 had expected failures
>	0 succeeded unexpectedly
>	5 were skipped
>==> test/work/func.log <==
>Running on Linux 3.14.4-200.fc20.x86_64 #1 SMP Tue May 13 13:51:08 UTC 2014 x86_64
>check_net found at /builddir/build/BUILD/monotone-1.0/test/bin/check_net
>warning: DISABLE_NETWORK_TESTS set, skipping network server tests
>mtn found at /builddir/build/BUILD/monotone-1.0/mtn
>warning: DISABLE_NETWORK_TESTS set, skipping network server tests
>monotone 1.0 (base revision: a7c3a1d9de1ba7a62c9dd9efee17252234bb502c)
>Running on          : Linux 3.14.4-200.fc20.x86_64 #1 SMP Tue May 13 13:51:08 UTC 2014 x86_64
>C++ compiler        : GNU C++ version 4.9.0 20140604 (Red Hat 4.9.0-8)
>C++ standard library: GNU libstdc++ version 20140604
>Boost version       : 1_55
>SQLite version      : 3.8.4.3 (compiled against 3.8.4.3)
>Lua version         : Lua 5.2
>PCRE version        : 8.35 2014-04-04 (compiled against 8.35)
>Botan version       : 1.10.8 (compiled against 1.10.8)
>Changes since base revision:
>format_version "1"
>new_manifest [b252820fde344fd3f5d023fd91de86522baa671d]
>old_revision [a7c3a1d9de1ba7a62c9dd9efee17252234bb502c]
>  Generated from data cached in the distribution;
>  further changes may have been made.
>Running tests...
>  3 (imp)_persistent_netsync_server_-_keys_2      skipped (line 2) 0:00, 0:00 on CPU
>  9 (normal)_netsync_on_partially_unrelated_revisions skipped (line 2) 0:00, 0:00 on CPU
> 10 (normal)_netsync_revision_with_no_certs       skipped (line 2) 0:00, 0:00 on CPU
> 12 (todo)_design_approval_semantics              expected failure (line 3) 0:00, 0:00 on CPU
> 13 (todo)_undo_update_command                    expected failure (line 3) 0:00, 0:00 on CPU
> 14 (todo)_vcheck                                 expected failure (line 5) 0:06, 0:00 on CPU
> 17 _--confdir_option_and_get_confdir_lua_function_work ok 0:02, 0:00 on CPU
> 16 _--author,_--date                             ok 0:11, 0:00 on CPU
>  7 (minor)_test_a_merge_4                        expected failure (line 30) 0:13, 0:00 on CPU
> 15 CRLF_line_normalization                       ok 0:13, 0:00 on CPU
> 18 _--db_with_parent_dir                         ok 0:05, 0:00 on CPU
>  6 (minor)_test_a_merge_3                        expected failure (line 30) 0:13, 0:00 on CPU
>  4 (minor)_add_own_db                            ok 0:14, 0:00 on CPU
>  5 (minor)_drop_in_subdir                        ok 0:16, 0:00 on CPU
>  8 (minor)_update_cleans_emptied_directories     ok 0:16, 0:00 on CPU
> 11 (normal)_update_across_discontinuity          ok 0:16, 0:00 on CPU
> 23 _MTN_case-folding_security_patch              FAIL (line 2) 0:03, 0:00 on CPU
> 22 _--rcfile_requires_extant_file                ok 0:05, 0:00 on CPU
>  2 (imp)_merge((patch_foo_a),_(delete_foo_))     ok 0:21, 0:00 on CPU
> 21 _--rcfile=directory                           ok 0:08, 0:00 on CPU
> 20 _--rcfile=-                                   ok 0:09, 0:00 on CPU
> 19 _--no-workspace                               ok 0:09, 0:00 on CPU
> 29 add_ignored                                   ok 0:07, 0:00 on CPU
> 24 _MTN_files_handled_correctly_in_aborted_commit ok 0:10, 0:00 on CPU
> 30 add_ignores__MTN                              ok 0:06, 0:00 on CPU
> 34 add_unknown_recursive                         FAIL (line 2) 0:01, 0:00 on CPU
> 32 add_inside__MTN_                              ok 0:02, 0:00 on CPU
> 27 add_and_then_drop_file_does_nothing           ok 0:07, 0:00 on CPU
> 28 add_executable                                ok 0:07, 0:00 on CPU
> 31 add_in_subdir                                 ok 0:03, 0:00 on CPU
> 25 _MTN_revision_is_required                     ok 0:11, 0:00 on CPU
> 33 add_unknown_ignored                           ok 0:03, 0:00 on CPU
> 35 add_unknown_recursive_ignored                 ok 0:02, 0:00 on CPU
> 26 add,remove,cleanup_registered_workspaces      ok 0:09, 0:00 on CPU
>  1 (imp)_deleting_directories                    ok 0:26, 0:00 on CPU
> 37 addition_of_files_and_directories             ok 0:03, 0:00 on CPU
> 43 annotate_ignores_untrusted_certs              ok 0:03, 0:00 on CPU
> 36 add_workspace_commit_in_another               expected failure (line 34) 0:04, 0:00 on CPU
> 40 annotate_file_added_on_different_forks        expected failure (line 27) 0:04, 0:00 on CPU
> 48 annotate_with_no_revs                         ok 0:02, 0:00 on CPU
> 41 annotate_file_on_multirooted_branch           expected failure (line 32) 0:04, 0:00 on CPU
> 47 annotate_with_human_output                    ok 0:03, 0:00 on CPU
> 44 annotate_where_line_splits                    ok 0:05, 0:00 on CPU
> 51 attr_init_functions                           ok 0:03, 0:00 on CPU
> 50 attr_drop                                     ok 0:04, 0:00 on CPU
> 45 annotate_where_lineage_depends_on_traversal   ok 0:06, 0:00 on CPU
> 46 annotate_where_one_parent_is_full_copy        ok 0:06, 0:00 on CPU
> 42 annotate_file_whose_name_changed              ok 0:07, 0:00 on CPU
> 53 attr_set_attr_get                             ok 0:04, 0:00 on CPU
> 49 attr_command_in_subdirs                       ok 0:05, 0:00 on CPU
> 54 attr_set_drop                                 ok 0:03, 0:00 on CPU
> 39 annotate_accidental_clean_merge               ok 0:09, 0:00 on CPU
> 62 automate_commands_are_not_completed           ok 0:03, 0:00 on CPU
> 38 alias_command                                 ok 0:11, 0:00 on CPU
> 58 automate_branches                             ok 0:06, 0:00 on CPU
> 60 automate_certs                                ok 0:06, 0:00 on CPU
> 59 automate_cert                                 ok 0:08, 0:00 on CPU
> 55 attr_set_get_commands                         ok 0:11, 0:00 on CPU
> 61 automate_checkout                             ok 0:09, 0:00 on CPU
> 64 automate_content_diff                         ok 0:09, 0:00 on CPU
> 52 attr_mtn_execute                              ok 0:14, 0:00 on CPU
> 65 automate_db_variables                         ok 0:11, 0:00 on CPU
> 56 automate_ancestors                            ok 0:14, 0:00 on CPU
> 71 automate_get_base_revision_id                 ok 0:04, 0:00 on CPU
> 57 automate_ancestry_difference                  ok 0:14, 0:00 on CPU
> 72 automate_get_content_changed                  ok 0:04, 0:00 on CPU
> 68 automate_file_merge                           ok 0:09, 0:00 on CPU
> 70 automate_get_attributes                       ok 0:07, 0:00 on CPU
> 74 automate_get_current_revision                 ok 0:05, 0:00 on CPU
> 80 automate_get_options                          ok 0:01, 0:00 on CPU
> 63 automate_common_ancestors                     ok 0:15, 0:00 on CPU
> 69 automate_generate_key                         ok 0:11, 0:00 on CPU
> 66 automate_descendents                          ok 0:14, 0:00 on CPU
> 67 automate_erase_ancestors                      ok 0:12, 0:00 on CPU
> 75 automate_get_current_revision_id              ok 0:04, 0:00 on CPU
> 79 automate_get_manifest_of                      ok 0:04, 0:00 on CPU
> 73 automate_get_corresponding_path               ok 0:07, 0:00 on CPU
> 82 automate_get_workspace_root                   ok 0:02, 0:00 on CPU
> 77 automate_get_file,_automate_get_file_of       ok 0:07, 0:00 on CPU
> 81 automate_get_revision                         ok 0:05, 0:00 on CPU
> 86 automate_interface_version                    ok 0:04, 0:00 on CPU
> 78 automate_get_file_size                        ok 0:08, 0:00 on CPU
> 96 automate_netsync                              skipped (line 11) 0:00, 0:00 on CPU
> 97 automate_netsync_dryrun                       skipped (line 6) 0:00, 0:00 on CPU
> 76 automate_get_extended_manifest_of             ok 0:09, 0:00 on CPU
> 88 automate_inventory_ignore_dirs                ok 0:05, 0:00 on CPU
> 85 automate_identify                             ok 0:05, 0:00 on CPU
> 91 automate_key_manage                           ok 0:06, 0:00 on CPU
> 95 automate_lua                                  ok 0:03, 0:00 on CPU
> 92 automate_keys                                 ok 0:06, 0:00 on CPU
> 89 automate_inventory_options                    ok 0:08, 0:00 on CPU
> 90 automate_inventory_restricted                 ok 0:09, 0:00 on CPU
> 99 automate_put_file                             ok 0:04, 0:00 on CPU
> 83 automate_graph                                ok 0:11, 0:00 on CPU
>102 automate_put_revision_unknown_file            ok 0:03, 0:00 on CPU
> 84 automate_heads                                ok 0:11, 0:00 on CPU
> 93 automate_leaves                               ok 0:08, 0:00 on CPU
>105 automate_set_drop_attribute                   ok 0:03, 0:00 on CPU
>101 automate_put_revision_for_merge               ok 0:07, 0:00 on CPU
> 94 automate_log                                  ok 0:10, 0:00 on CPU
>108 automate_stdio                                ok 0:03, 0:00 on CPU
>104 automate_select                               ok 0:06, 0:00 on CPU
>100 automate_put_revision                         ok 0:08, 0:00 on CPU
> 98 automate_parents,_automate_children           ok 0:09, 0:00 on CPU
>103 automate_roots                                ok 0:07, 0:00 on CPU
>109 automate_stdio_band_output                    ok 0:04, 0:00 on CPU
>110 automate_stdio_options                        ok 0:03, 0:00 on CPU
>115 b_t_and_a_selector_globbing                   FAIL (line 3) 0:01, 0:00 on CPU
>111 automate_tags                                 ok 0:04, 0:00 on CPU
>117 bad_packet_args                               ok 0:02, 0:00 on CPU
>123 branch_handling_in_disapprove                 expected failure (line 16) 0:02, 0:00 on CPU
>107 automate_show_conflicts_defaults              ok 0:07, 0:00 on CPU
>118 basic_invocation_and_options                  ok 0:04, 0:00 on CPU
>114 b_and_h_selectors                             ok 0:05, 0:00 on CPU
>122 branch-based_checkout                         ok 0:04, 0:00 on CPU
> 87 automate_inventory                            ok 0:18, 0:01 on CPU
>126 calculation_of_unidiffs                       ok 0:02, 0:00 on CPU
>112 automate_toposort                             ok 0:07, 0:01 on CPU
>125 calculation_of_other_unidiffs                 ok 0:04, 0:00 on CPU
>113 automate_update                               ok 0:07, 0:00 on CPU
>116 bad_and_unknown_certs                         ok 0:06, 0:00 on CPU
>131 catch_lua_output                              ok 0:01, 0:00 on CPU
>121 bisect_linear                                 FAIL (line 20) 0:06, 0:00 on CPU
>128 can_execute_things                            ok 0:03, 0:00 on CPU
>127 calculation_of_unidiffs_start_of_file         ok 0:03, 0:00 on CPU
>133 change_workspace                              ok 0:02, 0:00 on CPU
>141 checking_that_certain_commands_ignores_the_contents_of__MTN_options skipped (line 2) 0:00, 0:00 on CPU
>129 cancelled_arguments                           ok 0:04, 0:00 on CPU
>132 cert_no_branch                                ok 0:05, 0:00 on CPU
>136 check_--log                                   ok 0:04, 0:00 on CPU
>140 checking_a_few_command_specific_options       FAIL (line 2) 0:03, 0:00 on CPU
>147 checkout_in_windows_root                      skipped (line 3) 0:00, 0:00 on CPU
>130 cat_-r_REV_PATH                               ok 0:05, 0:00 on CPU
>139 check_that_--xargs_and_-(at)_behave_correctly ok 0:03, 0:00 on CPU
>120 bisect_blocked                                ok 0:09, 0:00 on CPU
>143 checkout_creates__MTN_log                     ok 0:04, 0:00 on CPU
>135 changing_passphrase_of_a_private_key          ok 0:06, 0:03 on CPU
>138 check_same_db_contents_macro                  ok 0:06, 0:00 on CPU
>150 clobbered_attrs                               ok 0:03, 0:00 on CPU
>142 checkout_-r_no_dir                            ok 0:06, 0:00 on CPU
>137 check_later_and_earlier_selectors             ok 0:07, 0:00 on CPU
>145 checkout_does_not_clobber_workspace           ok 0:03, 0:00 on CPU
>148 checkout_validates_target_directory           ok 0:04, 0:00 on CPU
>146 checkout_fails_with_multiple_heads            ok 0:04, 0:00 on CPU
>149 checkout_without_--branch_sets_branch         ok 0:06, 0:00 on CPU
>144 checkout_creates_right__MTN_options           ok 0:08, 0:00 on CPU
>159 commit_default_editor                         ok 0:04, 0:00 on CPU
>151 clone_aborts_on_branch_pattern_in_uri         ok 0:08, 0:00 on CPU
>161 commit_use_workspace_keydir                   ok 0:03, 0:00 on CPU
>124 branch_leaves_sync_bug                        ok 0:17, 0:01 on CPU
>134 changelog_editor                              ok 0:14, 0:00 on CPU
>153 clone_creates__MTN_log                        ok 0:08, 0:00 on CPU
>162 commit_using__MTN_log                         ok 0:02, 0:00 on CPU
>155 clone_validates_target_directory              ok 0:07, 0:00 on CPU
>163 commit_using__MTN_log_and_--message           ok 0:02, 0:00 on CPU
>170 creating_a_bad_criss-cross_merge              FAIL (line 2) 0:01, 0:00 on CPU
>157 clone_weird_branch_names                      ok 0:08, 0:00 on CPU
>164 commit_w_o__MTN_log_being_present             ok 0:03, 0:00 on CPU
>152 clone_branch_no_dir                           ok 0:11, 0:00 on CPU
>168 complete_option_names                         ok 0:03, 0:00 on CPU
>160 commit_update_multiple_heads_message          ok 0:09, 0:00 on CPU
>166 commit_writes_message_back_to__MTN_log        ok 0:03, 0:00 on CPU
>158 command_completion                            ok 0:10, 0:00 on CPU
>156 clone_warning_with_multiple_heads             ok 0:11, 0:00 on CPU
>167 committing_with_a_non-english_message         ok 0:06, 0:00 on CPU
>165 commit_with_--message-file                    ok 0:06, 0:00 on CPU
>173 creating_a_fork_and_updating                  ok 0:05, 0:00 on CPU
>175 database_aliases                              ok 0:03, 0:00 on CPU
>178 date_formatting                               ok 0:04, 0:00 on CPU
>172 creating_a_fork_and_merging                   ok 0:07, 0:00 on CPU
>171 creating_a_fork                               ok 0:09, 0:00 on CPU
>174 creating_a_good_and_bad_test_result           ok 0:06, 0:00 on CPU
>186 db_info_of_new_database                       ok 0:02, 0:00 on CPU
>183 db_data_format_checking                       ok 0:04, 0:00 on CPU
>154 clone_creates_right__MTN_options              ok 0:18, 0:00 on CPU
>184 db_execute                                    ok 0:03, 0:00 on CPU
>179 db_check_(heights)                            ok 0:08, 0:00 on CPU
>177 database_dump_load                            ok 0:09, 0:01 on CPU
>180 db_check_and_non-serious_errors               ok 0:08, 0:00 on CPU
>192 db_missing                                    ok 0:02, 0:00 on CPU
>182 db_check_file_sizes                           ok 0:06, 0:00 on CPU
>193 db_opt_fallback_mechanisms                    skipped (line 12) 0:01, 0:00 on CPU
>185 db_fix_certs                                  ok 0:07, 0:00 on CPU
>191 db_load_must_create_a_new_db                  ok 0:04, 0:00 on CPU
>200 delta_directions                              skipped (line 1) 0:00, 0:00 on CPU
>195 db_rosterify_preserves_renames                ok 0:03, 0:00 on CPU
>194 db_rosterify_on_a_db_with_a_root_suture       ok 0:03, 0:00 on CPU
>189 db_kill_rev_locally_and_recommit              ok 0:05, 0:00 on CPU
>197 default_command_options                       ok 0:04, 0:00 on CPU
>201 diagnostics_with--timestamps                  ok 0:02, 0:00 on CPU
>181 db_check_branch_leaves                        ok 0:10, 0:00 on CPU
>196 db_rosterify_twice_gives_an_error_second_time ok 0:04, 0:00 on CPU
>188 db_kill_rev_locally                           ok 0:07, 0:00 on CPU
>119 bisect                                        ok 0:35, 0:02 on CPU
>199 delete_work_file_on_checkout                  ok 0:02, 0:00 on CPU
>190 db_kill_rev_locally_workspace                 ok 0:07, 0:00 on CPU
>198 defecting_attributes                          ok 0:04, 0:00 on CPU
>176 database_check                                ok 0:14, 0:00 on CPU
>206 diff_in_a_never-committed_project             ok 0:01, 0:00 on CPU
>204 diff_a_binary_file                            ok 0:02, 0:00 on CPU
>210 diff_patch_add                                ok 0:02, 0:00 on CPU
>205 diff_against_empty_file                       ok 0:02, 0:00 on CPU
>202 diff_--external                               ok 0:03, 0:00 on CPU
>207 diff_on_missing_trailing_newline_at_end_of_file ok 0:02, 0:00 on CPU
>187 db_kill_certs_locally                         ok 0:09, 0:00 on CPU
>203 diff_-rREV1_-rREV2_UNCHANGED-FILE             ok 0:04, 0:00 on CPU
>211 diff_patch_drop                               ok 0:03, 0:00 on CPU
>208 diff_order                                    ok 0:04, 0:00 on CPU
>212 diff_patch_rename                             ok 0:04, 0:00 on CPU
>215 diff_reverse                                  ok 0:04, 0:00 on CPU
>216 diff_shows_renames                            ok 0:03, 0:00 on CPU
>213 diff_respects_restrictions                    ok 0:04, 0:00 on CPU
>219 diffing_with_explicit_rev_same_as_wc_rev      ok 0:03, 0:00 on CPU
>220 disallowing_persistence_of_passphrase         ok 0:04, 0:00 on CPU
>218 diffing_a_revision_with_an_added_file         ok 0:04, 0:00 on CPU
>214 diff_restriction_renamed_parent               ok 0:05, 0:00 on CPU
>221 disapproving_a_non_head                       ok 0:04, 0:00 on CPU
>217 diffing_a_file_within_revision_outside_a_workspace ok 0:05, 0:00 on CPU
>225 disapproving_of_bad_revision_range            ok 0:03, 0:00 on CPU
>227 do_not_log_the_result_of_hook_get_passphrase  ok 0:04, 0:00 on CPU
>229 drop_a_public_key                             ok 0:04, 0:00 on CPU
>228 drop_a_public_and_private_key                 ok 0:04, 0:00 on CPU
>233 drop_root                                     ok 0:02, 0:00 on CPU
>226 disapproving_with_message                     ok 0:04, 0:00 on CPU
>222 disapproving_of_a_merge_revision              ok 0:07, 0:00 on CPU
>231 drop_missing_and_unknown_files                ok 0:04, 0:00 on CPU
>232 drop_removes_attributes                       ok 0:04, 0:00 on CPU
>223 disapproving_of_a_revision                    ok 0:07, 0:00 on CPU
>244 exchanging_work_via_netsync                   skipped (line 2) 0:00, 0:00 on CPU
>245 exchanging_work_via_netsync,_with_notes       skipped (line 2) 0:00, 0:00 on CPU
>246 exchanging_work_via_netsync_sent_notes        skipped (line 7) 0:00, 0:00 on CPU
>238 empty_command_name                            ok 0:01, 0:00 on CPU
>236 dump_private_key                              ok 0:01, 0:00 on CPU
>230 drop_directory_with_unversioned_files_and_update ok 0:04, 0:00 on CPU
>224 disapproving_of_a_revision_range              ok 0:07, 0:00 on CPU
>239 empty_environment                             ok 0:02, 0:00 on CPU
>240 empty_id_completion                           ok 0:01, 0:00 on CPU
>243 exception-in-luaext                           ok 0:02, 0:00 on CPU
>237 duplicate_key_id                              ok 0:03, 0:00 on CPU
>251 fail_cleanly_on_unreadable__MTN_options       ok 0:02, 0:00 on CPU
>250 external_unit_test_of_the_line_merger         ok 0:03, 0:00 on CPU
>254 failed_checkout_is_a_no-op                    ok 0:02, 0:00 on CPU
>242 escaped_selectors                             ok 0:04, 0:00 on CPU
>241 empty_string_as_a_path_name                   ok 0:04, 0:00 on CPU
>235 dump_on_crash                                 ok 0:05, 0:00 on CPU
>253 fail_cleanly_when__MTN_format_corrupt         ok 0:03, 0:00 on CPU
>248 explicit_merge_LEFT_RIGHT_ANC_BRANCH          expected failure (line 26) 0:05, 0:00 on CPU
>262 get_netsync_read_permitted                    skipped (line 2) 0:00, 0:00 on CPU
>263 git_export                                    skipped (line 1) 0:00, 0:00 on CPU
>265 git_export_rename_loop                        skipped (line 1) 0:00, 0:00 on CPU
>255 fetching_nonexistent_entry_from_children_bug  ok 0:03, 0:00 on CPU
>256 filenames_in_diff_after_removal               ok 0:03, 0:00 on CPU
>259 files_with_spaces_at_the_end                  ok 0:02, 0:00 on CPU
>257 filenames_in_diff_after_rename                ok 0:02, 0:00 on CPU
>247 explicit_merge                                ok 0:06, 0:00 on CPU
>260 first_extent_normalization_pass               ok 0:03, 0:00 on CPU
>264 git_export_invalid_mapped_author              ok 0:02, 0:00 on CPU
>209 diff_output_formats                           ok 0:18, 0:02 on CPU
>269 i18n_commit_messages                          ok 0:03, 0:00 on CPU
>249 extended-selectors                            ok 0:09, 0:00 on CPU
>266 git_export_unmapped_authors                   ok 0:04, 0:00 on CPU
>252 fail_cleanly_on_unreadable_db                 ok 0:09, 0:00 on CPU
>273 importing_a_file                              ok 0:03, 0:00 on CPU
>268 heads_with_discontinuous_branches             ok 0:05, 0:00 on CPU
>270 i_selector                                    ok 0:05, 0:00 on CPU
>271 imp_test_filesync_confdir                     ok 0:05, 0:00 on CPU
>276 importing_cvs_file_added_on_a_branch          ok 0:03, 0:00 on CPU
>234 drop_with_actual_removal                      ok 0:15, 0:01 on CPU
>258 files_with_intermediate__MTN_path_elements    ok 0:09, 0:00 on CPU
>277 importing_cvs_file_dead_on_head_and_branch    ok 0:04, 0:00 on CPU
>278 importing_cvs_file_with_one_version           ok 0:03, 0:00 on CPU
>287 in_memory_database                            skipped (line 1) 0:00, 0:00 on CPU
>281 importing_cvs_metadata                        ok 0:02, 0:00 on CPU
>274 importing_cvs_branches                        expected failure (line 54) 0:06, 0:00 on CPU
>282 importing_cvs_problematic_repo                expected failure (line 13) 0:02, 0:00 on CPU
>261 generating_and_extracting_keys_and_certs      ok 0:11, 0:01 on CPU
>267 heads                                         ok 0:10, 0:00 on CPU
>275 importing_cvs_deleted_file                    ok 0:07, 0:00 on CPU
>288 include()_includedir()_and_includedirpattern()_lua_functions ok 0:03, 0:00 on CPU
>283 importing_cvs_small_real_repo                 ok 0:04, 0:00 on CPU
>280 importing_cvs_files_with_identical_logs       ok 0:05, 0:00 on CPU
>279 importing_cvs_files                           ok 0:06, 0:00 on CPU
>284 importing_cvs_tricky_repo_with_tags           ok 0:05, 0:00 on CPU
>290 invalid_--root_settings                       ok 0:03, 0:00 on CPU
>285 importing_cvs_with_vendor_imports_and_branches ok 0:04, 0:00 on CPU
>291 invalid__MTN_options                          ok 0:03, 0:00 on CPU
>292 invoke_subcommands                            ok 0:01, 0:00 on CPU
>293 invoke_toplevel_group                         ok 0:01, 0:00 on CPU
>299 keydir_defaults_to_under_confdir              ok 0:02, 0:00 on CPU
>296 key_files_created_securely                    ok 0:03, 0:00 on CPU
>302 list_databases                                ok 0:02, 0:00 on CPU
>304 list_workspaces                               ok 0:02, 0:00 on CPU
>297 key_files_deleted_securely                    ok 0:04, 0:00 on CPU
>305 listing_changed_files                         FAIL (line 2) 0:01, 0:00 on CPU
>303 list_missing_files                            ok 0:03, 0:00 on CPU
>295 keep_valid_workspace_options_on_error         ok 0:05, 0:00 on CPU
>301 list_branches                                 ok 0:04, 0:00 on CPU
>286 importing_files_with_non-english_names        ok 0:08, 0:00 on CPU
>294 k_selector                                    ok 0:05, 0:00 on CPU
>298 key_management_without_a_database             ok 0:06, 0:00 on CPU
>306 listing_workspace_manifests                   ok 0:03, 0:00 on CPU
>300 largish_file                                  ok 0:06, 0:01 on CPU
>307 locked_workspace                              ok 0:04, 0:00 on CPU
>308 log_--brief                                   ok 0:04, 0:00 on CPU
>314 log_and_selectors_returning_multiple_rids     ok 0:03, 0:00 on CPU
>321 log_with_windows_dirsep                       skipped (line 4) 0:00, 0:00 on CPU
>311 log_--last=N_FILENAME                         ok 0:05, 0:00 on CPU
>272 import                                        ok 0:18, 0:00 on CPU
>310 log_--last=N_--next=N                         ok 0:06, 0:00 on CPU
>319 log_recognizes_invalid_workspace_parent       ok 0:03, 0:00 on CPU
>309 log_--diffs                                   ok 0:06, 0:00 on CPU
>312 log_--no-files_and_--merges                   ok 0:05, 0:00 on CPU
>318 log_quits_on_SIGPIPE                          ok 0:04, 0:00 on CPU
>313 log_--to                                      ok 0:06, 0:00 on CPU
>322 logging_a_file_within_revision_outside_a_workspace ok 0:02, 0:00 on CPU
>289 inodeprints                                   ok 0:14, 0:00 on CPU
>329 ls_unknown_in_subdir                          ok 0:02, 0:00 on CPU
>323 ls_changed_respects_path_masks                ok 0:04, 0:00 on CPU
>315 log_dir                                       ok 0:08, 0:00 on CPU
>317 log_hides_deleted_renamed_files               ok 0:07, 0:00 on CPU
>330 ls_unknown_of_unknown_subdir                  ok 0:02, 0:00 on CPU
>331 lua_function_existsonpath                     ok 0:02, 0:00 on CPU
>334 manifest_restrictions                         FAIL (line 2) 0:00, 0:00 on CPU
>335 manpage                                       ok 0:01, 0:00 on CPU
>316 log_from_to_revision                          ok 0:08, 0:00 on CPU
>328 ls_tags_with_ambiguous_tags                   ok 0:04, 0:00 on CPU
>326 ls_duplicates_without_duplicates              ok 0:05, 0:00 on CPU
>327 ls_epochs                                     ok 0:05, 0:00 on CPU
>333 magic__MTN_in_restrictions                    ok 0:02, 0:00 on CPU
>324 ls_duplicates_with_duplicates                 ok 0:07, 0:00 on CPU
>332 m_selector                                    ok 0:04, 0:00 on CPU
>325 ls_duplicates_with_workspace                  ok 0:07, 0:00 on CPU
>336 merge((),_(add_a,_drop_a,_add_a))             ok 0:06, 0:00 on CPU
>349 merge_conflict_with_no_lca                    skipped (line 2) 0:00, 0:00 on CPU
>343 merge((patch_a),_(drop_a))                    ok 0:05, 0:00 on CPU
>338 merge((),_(drop_a,_rename_b_a,_patch_a))      ok 0:07, 0:00 on CPU
>320 log_with_restriction                          ok 0:12, 0:01 on CPU
>341 merge((drop_a),_(drop_a,_add_a))              ok 0:06, 0:00 on CPU
>346 merge((rename_a_b),_(rename_a_c))             ok 0:04, 0:00 on CPU
>345 merge((patch_foo_a),_(rename_foo__bar_))      ok 0:06, 0:00 on CPU
>342 merge((drop_a),_(rename_a_b,_patch_b))        ok 0:06, 0:00 on CPU
>339 merge((),_(patch_a,_drop_a,_add_a))           ok 0:08, 0:00 on CPU
>344 merge((patch_a),_(drop_a,_add_a))             ok 0:06, 0:00 on CPU
>340 merge((add_a),_(add_a,_drop_a,_add_a))        expected failure (line 37) 0:08, 0:00 on CPU
>337 merge((),_(add_a,_patch_a,_drop_a,_add_a))    ok 0:09, 0:00 on CPU
>348 merge_a_project_into_a_subdirectory_of_an_unrelated_project ok 0:05, 0:00 on CPU
>347 merge_--update                                ok 0:07, 0:00 on CPU
>106 automate_show_conflicts                       ok 1:29, 0:07 on CPU
>355 merge_into_workspace_same_rev                 ok 0:03, 0:00 on CPU
>358 merge_normalization_edge_case                 ok 0:04, 0:00 on CPU
>353 merge_into_workspace_mtn_execute              ok 0:05, 0:00 on CPU
>360 merge_rev_with_ancestor                       ok 0:04, 0:00 on CPU
>361 merge_update_part_of_file                     expected failure (line 46) 0:04, 0:00 on CPU
>352 merge_into_workspace_files_added              ok 0:06, 0:00 on CPU
>359 merge_rename_file_and_rename_dir              ok 0:05, 0:00 on CPU
>350 merge_into_workspace                          ok 0:08, 0:00 on CPU
>357 merge_multiple_heads_1                        ok 0:07, 0:00 on CPU
>354 merge_into_workspace_no_changes               ok 0:08, 0:00 on CPU
>351 merge_into_workspace_attr_corpse              ok 0:09, 0:00 on CPU
>363 merge_with_conflicting_name_and_renamed_dir   ok 0:06, 0:00 on CPU
>372 migrate_workspace                             ok 0:03, 0:00 on CPU
>365 merging_(add_a,_rename_a_b)_with_(add_b)      ok 0:06, 0:00 on CPU
>362 merge_with_add,_rename_file,_and_rename_dir   ok 0:08, 0:00 on CPU
>368 merging_adds_in_unrelated_revisions           expected failure (line 18) 0:04, 0:00 on CPU
>367 merging_adds                                  ok 0:05, 0:00 on CPU
>169 conflict_messages                             FAIL (line 756) 1:13, 0:08 on CPU
>373 missing_empty_dir                             ok 0:03, 0:00 on CPU
>383 netsync,--exclude,defaults                    skipped (line 2) 0:00, 0:00 on CPU
>384 netsync,--set-default                         skipped (line 2) 0:00, 0:00 on CPU
>371 merging_data_in_unrelated_revisions           expected failure (line 19) 0:04, 0:00 on CPU
>386 netsync_bind_opt                              skipped (line 1) 0:00, 0:00 on CPU
>387 netsync_client_absorbs_and_checks_epochs      skipped (line 2) 0:00, 0:00 on CPU
>388 netsync_client_absorbs_server_key             skipped (line 2) 0:00, 0:00 on CPU
>389 netsync_default_server_pattern                skipped (line 2) 0:00, 0:00 on CPU
>390 netsync_default_server_pattern_setting        skipped (line 2) 0:00, 0:00 on CPU
>391 netsync_dry_run                               skipped (line 1) 0:00, 0:00 on CPU
>392 netsync_duplicate_keys                        skipped (line 2) 0:00, 0:00 on CPU
>393 netsync_epoch_refinement                      skipped (line 1) 0:00, 0:00 on CPU
>394 netsync_epochs_are_not_sent_upstream_by_pull  skipped (line 2) 0:00, 0:00 on CPU
>395 netsync_hook_errcodes                         skipped (line 2) 0:00, 0:00 on CPU
>396 netsync_is_not_interrupted_by_SIGPIPE         skipped (line 3) 0:00, 0:00 on CPU
>397 netsync_key_hooks                             skipped (line 2) 0:00, 0:00 on CPU
>398 netsync_largish_file                          skipped (line 2) 0:00, 0:00 on CPU
>399 netsync_mtn_uri_scheme                        skipped (line 2) 0:00, 0:00 on CPU
>400 netsync_negotiation                           skipped (line 1) 0:00, 0:00 on CPU
>374 mkdir                                         ok 0:03, 0:00 on CPU
>402 netsync_per_server_defaults                   skipped (line 1) 0:00, 0:00 on CPU
>403 netsync_permissions                           skipped (line 2) 0:00, 0:00 on CPU
>404 netsync_permissions_wildcards                 skipped (line 2) 0:00, 0:00 on CPU
>405 netsync_server_absorbs_and_checks_epochs      skipped (line 2) 0:00, 0:00 on CPU
>406 netsync_stop_server                           skipped (line 1) 0:00, 0:00 on CPU
>407 netsync_transfers_public_keys                 skipped (line 2) 0:00, 0:00 on CPU
>408 netsync_verifies_server_keys                  skipped (line 2) 0:00, 0:00 on CPU
>409 netsync_with_globs                            skipped (line 2) 0:00, 0:00 on CPU
>410 netsync_with_suspended_branch                 skipped (line 2) 0:00, 0:00 on CPU
>369 merging_an_add_edge                           expected failure (line 26) 0:05, 0:00 on CPU
>370 merging_data_in_unrelated_files               expected failure (line 22) 0:05, 0:00 on CPU
>375 modification_of_an_empty_file                 ok 0:03, 0:00 on CPU
>385 netsync_badhost_gives_nice_error              ok 0:02, 0:00 on CPU
>415 one-way_netsync_where_the_sink_has_more_epochs skipped (line 2) 0:00, 0:00 on CPU
>377 mtn_add_dot                                   ok 0:05, 0:00 on CPU
>381 multiple_message_commit                       ok 0:04, 0:00 on CPU
>418 persistent_netsync_server_-_keys              skipped (line 2) 0:00, 0:00 on CPU
>419 persistent_netsync_server_-_revs_&_certs      skipped (line 2) 0:00, 0:00 on CPU
>364 merging_(add_a)_with_(add_a,_drop_a)          ok 0:12, 0:00 on CPU
>421 pid_file_cleanup                              skipped (line 2) 0:00, 0:00 on CPU
>378 mtn_execute_attr_respects_umask               ok 0:05, 0:00 on CPU
>414 normalized_filenames                          ok 0:04, 0:00 on CPU
>380 mtn_up                                        ok 0:06, 0:00 on CPU
>379 mtn_read_FILE                                 ok 0:07, 0:00 on CPU
>416 p_selector                                    ok 0:05, 0:00 on CPU
>412 non_workspace_keydir                          ok 0:07, 0:00 on CPU
>413 noop_merge_into_workspace                     ok 0:08, 0:00 on CPU
>356 merge_manual_file                             ok 0:18, 0:01 on CPU
>420 pid_file_and_log_handles_open_failures        ok 0:04, 0:00 on CPU
>417 persistence_of_passphrase                     ok 0:04, 0:00 on CPU
>430 pluck_restricted                              FAIL (line 1) 0:01, 0:00 on CPU
>431 propagate_a_descendent                        FAIL (line 2) 0:01, 0:00 on CPU
>433 pull_a_netsync_branch_which_has_a_parent_from_another_branch skipped (line 2) 0:00, 0:00 on CPU
>434 quiet_turns_off_tickers_but_not_warnings      skipped (line 2) 0:00, 0:00 on CPU
>436 reallyquiet_turns_off_tickers_and_warnings    skipped (line 2) 0:00, 0:00 on CPU
>376 move_conflicting_unversioned                  ok 0:11, 0:00 on CPU
>366 merging_a_rename_twice                        ok 0:15, 0:01 on CPU
>411 no-change_deltas_disappear                    ok 0:10, 0:00 on CPU
>401 netsync_over_pipes                            ok 0:10, 0:00 on CPU
>423 pivot_root_to_new_dir                         ok 0:06, 0:00 on CPU
>422 pivot_root                                    ok 0:07, 0:00 on CPU
>437 refresh_inodeprints                           ok 0:02, 0:00 on CPU
>424 pluck_basics                                  ok 0:07, 0:00 on CPU
>442 rename_in_new_workspace                       ok 0:02, 0:00 on CPU
>426 pluck_directory_bug_2                         expected failure (line 35) 0:06, 0:00 on CPU
>435 read_and_convert_old_privkey_packet           ok 0:04, 0:00 on CPU
>427 pluck_does_not_clobber_workspace              ok 0:06, 0:00 on CPU
>440 rename_file_to_dir                            ok 0:03, 0:00 on CPU
>425 pluck_directory_bug_1                         expected failure (line 38) 0:08, 0:00 on CPU
>429 pluck_mtn_execute                             ok 0:05, 0:00 on CPU
>438 rename_cannot_overwrite_files                 ok 0:05, 0:00 on CPU
>453 repeatedly_exchanging_work_via_netsync        skipped (line 2) 0:00, 0:00 on CPU
>445 rename_warns_on_subdir_move                   ok 0:02, 0:00 on CPU
>446 rename_with_actual_file_rename                ok 0:03, 0:00 on CPU
>382 multiple_version_committing                   ok 0:15, 0:01 on CPU
>444 rename_moves_attributes                       ok 0:04, 0:00 on CPU
>428 pluck_lifecycle                               ok 0:08, 0:00 on CPU
>443 rename_in_subdir                              ok 0:05, 0:00 on CPU
>432 propagate_an_ancestor                         ok 0:08, 0:02 on CPU
>454 replace_dir_with_file                         ok 0:03, 0:00 on CPU
>449 renaming_a_directory_and_then_adding_a_new_with_the_old_name ok 0:04, 0:00 on CPU
>455 replace_file_with_dir                         ok 0:03, 0:00 on CPU
>447 renaming_a_deleted_file                       ok 0:05, 0:00 on CPU
>439 rename_dir_to_non-sibling                     ok 0:09, 0:00 on CPU
>441 rename_files_into_a_directory                 ok 0:09, 0:00 on CPU
>451 renaming_a_patched_file                       ok 0:06, 0:00 on CPU
>448 renaming_a_directory                          ok 0:07, 0:00 on CPU
>452 renaming_and_editing_a_file                   ok 0:07, 0:00 on CPU
>450 renaming_a_file                               ok 0:08, 0:00 on CPU
>460 resolve_conflicts_duplicate_name_directory    ok 0:06, 0:00 on CPU
>458 resolve_conflicts_content                     ok 0:07, 0:00 on CPU
>456 resolve_conflicts_all_merge_commands          ok 0:07, 0:00 on CPU
>462 resolve_conflicts_multiple_names              ok 0:05, 0:00 on CPU
>463 resolve_conflicts_none                        ok 0:05, 0:00 on CPU
>468 restricted_commit_with_inodeprints            expected failure (line 37) 0:03, 0:00 on CPU
>469 restricted_diff_file_in_renamed_dir           ok 0:02, 0:00 on CPU
>459 resolve_conflicts_duplicate_name              ok 0:06, 0:00 on CPU
>470 restriction_includes_parent_dir               ok 0:04, 0:00 on CPU
>461 resolve_conflicts_errors                      ok 0:08, 0:01 on CPU
>471 restrictions_when_pwd_is_mixed_case           ok 0:03, 0:00 on CPU
>457 resolve_conflicts_all_resolutions             ok 0:10, 0:01 on CPU
>478 revert_directory_blocked_by_unversioned_directory expected failure (line 19) 0:04, 0:00 on CPU
>472 restrictions_with_deletes                     ok 0:04, 0:00 on CPU
>479 revert_directory_blocked_by_unversioned_file  expected failure (line 17) 0:04, 0:00 on CPU
>476 revert_contents_not_parent_rename             ok 0:05, 0:00 on CPU
>465 resolve_conflicts_propagate                   ok 0:08, 0:00 on CPU
>474 revert_--missing_in_subdir                    ok 0:05, 0:00 on CPU
>477 revert_directories                            ok 0:05, 0:00 on CPU
>480 revert_directory_replaced_by_file             expected failure (line 15) 0:03, 0:00 on CPU
>482 revert_file_blocked_by_unversioned_directory  expected failure (line 16) 0:02, 0:00 on CPU
>475 revert_attrs                                  ok 0:06, 0:00 on CPU
>481 revert_drop_not_rename                        ok 0:04, 0:00 on CPU
>484 revert_file_in_new_project                    ok 0:02, 0:00 on CPU
>483 revert_file_blocked_by_unversioned_file       expected failure (line 18) 0:04, 0:00 on CPU
>464 resolve_conflicts_orphaned_file               ok 0:11, 0:01 on CPU
>485 revert_file_replaced_by_directory             expected failure (line 14) 0:03, 0:00 on CPU
>490 revert_renamed_directory_replaced_by_file     expected failure (line 19) 0:03, 0:00 on CPU
>487 revert_ignored_files                          ok 0:03, 0:00 on CPU
>491 revert_renamed_file_replaced_by_directory     expected failure (line 18) 0:03, 0:00 on CPU
>495 revert_uncommitted_execute_attr               expected failure (line 16) 0:01, 0:00 on CPU
>489 revert_moving_a_file_to_a_renamed_directory   ok 0:03, 0:00 on CPU
>467 restricted_commands_are_consistent            ok 0:11, 0:01 on CPU
>493 revert_the_middle_of_a_sequence               expected failure (line 28) 0:02, 0:00 on CPU
>488 revert_in_subdirs                             ok 0:04, 0:00 on CPU
>492 revert_renames                                ok 0:04, 0:00 on CPU
>473 restrictions_with_renames_and_adds            ok 0:10, 0:00 on CPU
>505 schema_migration_bad_schema                   ok 0:02, 0:00 on CPU
>507 schema_migration_new_db                       ok 0:02, 0:00 on CPU
>497 reverting_a_pivot_root                        expected failure (line 43) 0:05, 0:00 on CPU
>511 serve-automate                                skipped (line 1) 0:00, 0:00 on CPU
>512 serve-automate-single-run                     skipped (line 1) 0:00, 0:00 on CPU
>513 serve_pull_with_--exclude                     skipped (line 2) 0:00, 0:00 on CPU
>514 server_initiated_sync                         skipped (line 2) 0:00, 0:00 on CPU
>501 rosterify_on_a_db_with_1_rev                  ok 0:04, 0:00 on CPU
>502 rosterify_on_a_db_with_an_empty_manifest      ok 0:04, 0:00 on CPU
>500 rosterify_migrates_file_dir_attrs             ok 0:05, 0:00 on CPU
>496 revert_works_with_restrictions                ok 0:06, 0:00 on CPU
>503 scanning_trees                                ok 0:05, 0:00 on CPU
>498 rosterify_--drop-attr                         ok 0:06, 0:00 on CPU
>506 schema_migration_error_recovery               ok 0:04, 0:00 on CPU
>509 select_partial_id                             ok 0:04, 0:00 on CPU
>517 setup_creates__MTN_log                        ok 0:01, 0:00 on CPU
>524 single_manifest_netsync                       skipped (line 2) 0:00, 0:00 on CPU
>518 setup_creates_default_db                      ok 0:01, 0:00 on CPU
>515 setup_and_clone_keep_bookkeeping_dir          ok 0:02, 0:00 on CPU
>486 revert_file_to_base_revision                  ok 0:10, 0:01 on CPU
>519 setup_in_subdirectory                         ok 0:02, 0:00 on CPU
>494 revert_unchanged_file_preserves_mtime         ok 0:09, 0:00 on CPU
>526 spawn_pipe                                    ok 0:01, 0:00 on CPU
>520 setup_on_existing_path                        ok 0:03, 0:00 on CPU
>527 sql_function_gunzip_(which_replaced_unpack)   ok 0:02, 0:00 on CPU
>499 rosterify_handles_.mt-ignore_files            ok 0:08, 0:00 on CPU
>521 short_options_work_correctly                  ok 0:03, 0:00 on CPU
>525 skip_invalid_paths                            ok 0:02, 0:00 on CPU
>532 status_with_no_key                            FAIL (line 4) 0:01, 0:00 on CPU
>537 sync_use_ws_opts                              skipped (line 4) 0:00, 0:00 on CPU
>522 signature_round_trip                          ok 0:03, 0:00 on CPU
>536 sync_server_--exclude_foo                     ok 0:02, 0:00 on CPU
>531 status_with_missing_files                     ok 0:03, 0:00 on CPU
>516 setup_checkout_touch_new__MTN_options_only    ok 0:05, 0:00 on CPU
>530 status_with_attrs                             ok 0:03, 0:00 on CPU
>510 selecting_arbitrary_certs                     ok 0:06, 0:00 on CPU
>538 syntax_errors_in_.mtn-ignore                  ok 0:02, 0:00 on CPU
>523 single_character_filename_support             ok 0:06, 0:00 on CPU
>534 subdirectory_restrictions                     ok 0:04, 0:00 on CPU
>528 ssh_agent                                     skipped (line 75) 0:05, 0:00 on CPU
>529 status                                        ok 0:06, 0:00 on CPU
>542 test_a_merge_5                                ok 0:03, 0:00 on CPU
>548 test_some_hook_helper_functions               ok 0:02, 0:00 on CPU
>543 test_a_merge_6                                ok 0:06, 0:00 on CPU
>541 test_a_merge_2                                ok 0:06, 0:00 on CPU
>540 test_a_merge                                  ok 0:06, 0:00 on CPU
>545 test_a_merge_8                                ok 0:05, 0:00 on CPU
>550 test_the_help_command                         ok 0:03, 0:00 on CPU
>551 test_the_version_command                      ok 0:03, 0:00 on CPU
>539 tags_and_tagging_of_revisions                 ok 0:08, 0:00 on CPU
>546 test_a_merge_9                                expected failure (line 30) 0:05, 0:00 on CPU
>552 things_in_.mtn-ignore_get_ignored             ok 0:02, 0:00 on CPU
>549 test_the_approve_command                      ok 0:05, 0:00 on CPU
>561 two_parent_workspace_pivot_root               FAIL (line 1) 0:01, 0:00 on CPU
>544 test_a_merge_7                                ok 0:08, 0:00 on CPU
>535 suspend                                       ok 0:11, 0:00 on CPU
>554 two_parent_workspace_add_drop_rename          ok 0:05, 0:00 on CPU
>556 two_parent_workspace_attrs                    ok 0:05, 0:00 on CPU
>533 sticky_branches                               ok 0:14, 0:00 on CPU
>553 trust_hooks_and_trusted_command               ok 0:06, 0:00 on CPU
>555 two_parent_workspace_annotate                 expected failure (line 32) 0:06, 0:00 on CPU
>547 test_annotate_command                         ok 0:12, 0:00 on CPU
>557 two_parent_workspace_commands_that_fail       ok 0:07, 0:00 on CPU
>563 u_selector                                    ok 0:05, 0:00 on CPU
>566 unnormalized_paths_in_database                ok 0:02, 0:00 on CPU
>560 two_parent_workspace_list                     ok 0:07, 0:00 on CPU
>568 update_-b_switches_branches_even_when_noop    ok 0:04, 0:00 on CPU
>572 update_does_not_suggest_suspended_branches    FAIL (line 3) 0:02, 0:00 on CPU
>562 two_parent_workspace_pluck                    ok 0:07, 0:00 on CPU
>567 update_-b_foo_updates__MTN_options_correctly  ok 0:05, 0:00 on CPU
>575 update_no-ops_when_no_parent_revision         ok 0:01, 0:00 on CPU
>569 update_1                                      ok 0:05, 0:00 on CPU
>576 update_to_non-existent_rev                    ok 0:02, 0:00 on CPU
>565 undrop                                        ok 0:07, 0:00 on CPU
>571 update_does_not_stomp_non-monotone_files      ok 0:05, 0:00 on CPU
>573 update_ignores_suspended_heads                ok 0:05, 0:00 on CPU
>574 update_loses_execute                          ok 0:04, 0:00 on CPU
>570 update_does_not_clobber_workspace             ok 0:06, 0:00 on CPU
>578 update_updates_inodeprints                    ok 0:04, 0:00 on CPU
>564 unchanged_options_preserves_mtime             ok 0:12, 0:00 on CPU
>581 update_with_pending_add                       expected failure (line 18) 0:05, 0:00 on CPU
>583 update_with_pending_modification              expected failure (line 26) 0:04, 0:00 on CPU
>588 usage_output_streams                          ok 0:02, 0:00 on CPU
>582 update_with_pending_drop                      ok 0:05, 0:00 on CPU
>559 two_parent_workspace_inodeprints              ok 0:16, 0:00 on CPU
>584 update_with_pending_rename                    ok 0:04, 0:00 on CPU
>580 update_with_multiple_candidates               ok 0:08, 0:00 on CPU
>579 update_with_blocked_rename                    expected failure (line 41) 0:08, 0:00 on CPU
>586 updating_through_a_pivot_root                 ok 0:05, 0:00 on CPU
>593 util_mtnopt                                   ok 0:02, 0:00 on CPU
>595 validate_commit_message_hook                  FAIL (line 2) 0:00, 0:00 on CPU
>577 update_to_off-branch_rev                      ok 0:09, 0:00 on CPU
>585 updating_from_a_merge_which_adds_a_file       ok 0:06, 0:00 on CPU
>592 user_commands                                 ok 0:03, 0:00 on CPU
>591 use_restrictions_with_--exclude_and_inodeprints ok 0:03, 0:00 on CPU
>594 validate_changes_hook                         ok 0:02, 0:00 on CPU
>587 updating_to_a_given_revision                  ok 0:06, 0:00 on CPU
>600 warn_on_bad_restriction                       ok 0:01, 0:00 on CPU
>597 verbosity                                     ok 0:02, 0:00 on CPU
>598 verification_of_command_line_options          ok 0:02, 0:00 on CPU
>589 use_inodeprints_hook                          ok 0:05, 0:00 on CPU
>590 use_restrictions_with_--exclude               ok 0:05, 0:00 on CPU
>596 vars                                          ok 0:03, 0:00 on CPU
>508 schema_migration_with_rosterify               ok 0:37, 0:08 on CPU
>599 w_selector                                    ok 0:04, 0:00 on CPU
>604 ws_ops_with_wrong_node_type                   ok 0:02, 0:00 on CPU
>603 wrong_options_override_workspace_options      ok 0:03, 0:00 on CPU
>601 warn_on_weird_branch_names                    ok 0:06, 0:00 on CPU
>602 workspace_migration                           ok 0:12, 0:01 on CPU
>504 schema_migration                              ok 0:49, 0:13 on CPU
>558 two_parent_workspace_inodeprint_from_birth    ok 0:35, 0:00 on CPU
>466 resolve_conflicts_read_all                    ok 1:07, 0:07 on CPU
>**************************************************
>Test _MTN_case-folding_security_patch
>_MTN_case-folding_security_patch:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>_MTN_case-folding_security_patch:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>_MTN_case-folding_security_patch:2: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>_MTN_case-folding_security_patch:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/_MTN_case-folding_security_patch --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/_MTN_case-folding_security_patch --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/_MTN_case-folding_security_patch/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/_MTN_case-folding_security_patch/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/_MTN_case-folding_security_patch/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>_MTN_case-folding_security_patch:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/_MTN_case-folding_security_patch --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/_MTN_case-folding_security_patch --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/_MTN_case-folding_security_patch/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/_MTN_case-folding_security_patch/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/_MTN_case-folding_security_patch/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:130: in function 'mtn_setup'
>	/builddir/build/BUILD/monotone-1.0/test/func/_MTN_case-folding_security_patch/__driver__.lua:2: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test add_unknown_recursive
>add_unknown_recursive:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>add_unknown_recursive:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>add_unknown_recursive:2: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>add_unknown_recursive:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/add_unknown_recursive --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/add_unknown_recursive --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/add_unknown_recursive/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/add_unknown_recursive/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/add_unknown_recursive/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>add_unknown_recursive:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/add_unknown_recursive --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/add_unknown_recursive --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/add_unknown_recursive/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/add_unknown_recursive/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/add_unknown_recursive/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:130: in function 'mtn_setup'
>	/builddir/build/BUILD/monotone-1.0/test/func/add_unknown_recursive/__driver__.lua:2: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test b_t_and_a_selector_globbing
>b_t_and_a_selector_globbing:3: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>b_t_and_a_selector_globbing:3: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>b_t_and_a_selector_globbing:3: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>b_t_and_a_selector_globbing:3: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/b_t_and_a_selector_globbing --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/b_t_and_a_selector_globbing --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/b_t_and_a_selector_globbing/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/b_t_and_a_selector_globbing/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/b_t_and_a_selector_globbing/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>b_t_and_a_selector_globbing:3: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/b_t_and_a_selector_globbing --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/b_t_and_a_selector_globbing --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/b_t_and_a_selector_globbing/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/b_t_and_a_selector_globbing/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/b_t_and_a_selector_globbing/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:130: in function 'mtn_setup'
>	/builddir/build/BUILD/monotone-1.0/test/func/b_t_and_a_selector_globbing/__driver__.lua:3: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test bisect_linear
>bisect_linear:1: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>bisect_linear:1: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>bisect_linear:1: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>mtn: read 1 packet
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net setup --branch=testbranch .
>stdout:
>stderr:
>exit code: 0
>bisect_linear:1: remove test_keys
>bisect_linear:3: writefile r1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:3: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net add r1
>stdout:
>stderr:
>mtn: adding 'r1' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:4: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net commit --message r1 --branch testbranch
>stdout:
>stderr:
>mtn: beginning commit on branch 'testbranch'
>mtn: committed revision 51c7db674ca2f29c8abc951b9525ef442f03c0f3
>exit code: 0
>bisect_linear:5: readfile _MTN/revision
>bisect_linear:7: writefile r2
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:7: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net add r2
>stdout:
>stderr:
>mtn: adding 'r2' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:8: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net commit --message r2 --branch testbranch
>stdout:
>stderr:
>mtn: beginning commit on branch 'testbranch'
>mtn: committed revision a409b341948bacefa84fee396514723bdcf3ef49
>exit code: 0
>bisect_linear:9: readfile _MTN/revision
>bisect_linear:11: writefile r3
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:11: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net add r3
>stdout:
>stderr:
>mtn: adding 'r3' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:12: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net commit --message r3 --branch testbranch
>stdout:
>stderr:
>mtn: beginning commit on branch 'testbranch'
>mtn: committed revision 42af7f96eb26d7bd8f9724de7844dce61761ce3e
>exit code: 0
>bisect_linear:13: readfile _MTN/revision
>bisect_linear:15: writefile r4
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:15: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net add r4
>stdout:
>stderr:
>mtn: adding 'r4' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:16: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net commit --message r4 --branch testbranch
>stdout:
>stderr:
>mtn: beginning commit on branch 'testbranch'
>mtn: committed revision ee4479af5b1da696e33c51c4c220fdbd5043f2aa
>exit code: 0
>bisect_linear:17: readfile _MTN/revision
>bisect_linear:19: writefile r5
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:19: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net add r5
>stdout:
>stderr:
>mtn: adding 'r5' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>bisect_linear:20: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/bisect_linear/keys --key=tester@test.net commit --message r5 --branch testbranch
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:106: in function 'commit'
>	/builddir/build/BUILD/monotone-1.0/test/func/bisect_linear/__driver__.lua:20: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test checking_a_few_command_specific_options
>checking_a_few_command_specific_options:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>checking_a_few_command_specific_options:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>checking_a_few_command_specific_options:2: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>checking_a_few_command_specific_options:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/checking_a_few_command_specific_options --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/checking_a_few_command_specific_options --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/checking_a_few_command_specific_options/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/checking_a_few_command_specific_options/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/checking_a_few_command_specific_options/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>checking_a_few_command_specific_options:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/checking_a_few_command_specific_options --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/checking_a_few_command_specific_options --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/checking_a_few_command_specific_options/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/checking_a_few_command_specific_options/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/checking_a_few_command_specific_options/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:130: in function 'mtn_setup'
>	/builddir/build/BUILD/monotone-1.0/test/func/checking_a_few_command_specific_options/__driver__.lua:2: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test creating_a_bad_criss-cross_merge
>creating_a_bad_criss-cross_merge:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>creating_a_bad_criss-cross_merge:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>creating_a_bad_criss-cross_merge:2: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>creating_a_bad_criss-cross_merge:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/creating_a_bad_criss-cross_merge --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/creating_a_bad_criss-cross_merge --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/creating_a_bad_criss-cross_merge/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/creating_a_bad_criss-cross_merge/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/creating_a_bad_criss-cross_merge/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>creating_a_bad_criss-cross_merge:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/creating_a_bad_criss-cross_merge --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/creating_a_bad_criss-cross_merge --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/creating_a_bad_criss-cross_merge/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/creating_a_bad_criss-cross_merge/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/creating_a_bad_criss-cross_merge/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:130: in function 'mtn_setup'
>	/builddir/build/BUILD/monotone-1.0/test/func/creating_a_bad_criss-cross_merge/__driver__.lua:2: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test listing_changed_files
>listing_changed_files:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>listing_changed_files:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>listing_changed_files:2: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>listing_changed_files:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/listing_changed_files --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/listing_changed_files --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/listing_changed_files/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/listing_changed_files/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/listing_changed_files/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>listing_changed_files:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/listing_changed_files --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/listing_changed_files --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/listing_changed_files/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/listing_changed_files/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/listing_changed_files/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:130: in function 'mtn_setup'
>	/builddir/build/BUILD/monotone-1.0/test/func/listing_changed_files/__driver__.lua:2: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test manifest_restrictions
>manifest_restrictions:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>manifest_restrictions:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>manifest_restrictions:2: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>manifest_restrictions:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/manifest_restrictions --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/manifest_restrictions --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/manifest_restrictions/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/manifest_restrictions/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/manifest_restrictions/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>manifest_restrictions:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/manifest_restrictions --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/manifest_restrictions --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/manifest_restrictions/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/manifest_restrictions/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/manifest_restrictions/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:130: in function 'mtn_setup'
>	/builddir/build/BUILD/monotone-1.0/test/func/manifest_restrictions/__driver__.lua:2: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test conflict_messages
>conflict_messages:1: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>conflict_messages:1: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>conflict_messages:1: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>mtn: read 1 packet
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup --branch=testbranch .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:1: remove test_keys
>conflict_messages:20: remove _MTN
>conflict_messages:20: remove foo
>conflict_messages:20: remove bar
>conflict_messages:20: remove baz
>conflict_messages:20: remove missing-root
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:20: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch missing-root
>stdout:
>stderr:
>exit code: 0
>conflict_messages:22: mkdir foo
>conflict_messages:23: writefile foo/foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:23: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo/foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>mtn: adding 'foo/foo' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:24: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch missing-root
>stdout:
>stderr:
>mtn: beginning commit on branch 'missing-root'
>mtn: committed revision ead03530f5fefe50c9010157c42c0ebe18086559
>exit code: 0
>conflict_messages:26: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:28: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net co --branch missing-root missing-root
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: function: 0x26fb3e0, local_redir = false, requested = false
>conflict_messages:29: In directory missing-root: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pivot_root foo bar
>stdout:
>stderr:
>mtn: renaming 'foo' to ''
>mtn: renaming '' to 'bar'
>exit code: 0
>stdin:
>runcmd: function: 0x2700c20, local_redir = false, requested = false
>conflict_messages:31: In directory missing-root: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message commit
>stdout:
>stderr:
>mtn: beginning commit on branch 'missing-root'
>mtn: committed revision 532ab5011ea9e64aa212d4ea52363b1b8133d5ba
>exit code: 0
>conflict_messages:33: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:35: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net drop --recursive foo
>stdout:
>stderr:
>mtn: dropping 'foo/foo' from workspace manifest
>mtn: dropping 'foo' from workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:39: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'missing-root'
>mtn: selected update target 532ab5011ea9e64aa212d4ea52363b1b8133d5ba
>mtn: [left]  ae3e535d8eabed2fe676674f5e640425bac38fb6
>mtn: [right] 532ab5011ea9e64aa212d4ea52363b1b8133d5ba
>mtn: conflict: missing root directory
>mtn: directory 'foo' deleted on the left
>mtn: directory 'foo' pivoted to root on the right
>mtn: conflict: orphaned directory '' from revision ead03530f5fefe50c9010157c42c0ebe18086559
>mtn: parent directory '' was deleted on the left
>mtn: directory 'bar' was renamed from '' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:42: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch missing-root-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'missing-root-propagate'
>mtn: committed revision b94a03a922c2c281a88d8988db64e76a32edb6a1
>exit code: 0
>conflict_messages:43: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:45: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate missing-root missing-root-propagate
>stdout:
>stderr:
>mtn: propagating missing-root -> missing-root-propagate
>mtn: [left]  532ab5011ea9e64aa212d4ea52363b1b8133d5ba
>mtn: [right] b94a03a922c2c281a88d8988db64e76a32edb6a1
>mtn: conflict: missing root directory
>mtn: directory 'foo' pivoted to root on the left
>mtn: directory 'foo' deleted on the right
>mtn: conflict: orphaned directory '' from revision ead03530f5fefe50c9010157c42c0ebe18086559
>mtn: parent directory '' was deleted on the right
>mtn: directory 'bar' was renamed from '' on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:47: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert b94a03a922c2c281a88d8988db64e76a32edb6a1 branch missing-root
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:49: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 532ab5011ea9e64aa212d4ea52363b1b8133d5ba b94a03a922c2c281a88d8988db64e76a32edb6a1
>stdout:
>ancestor [ead03530f5fefe50c9010157c42c0ebe18086559]
>stderr:
>mtn: [left]  532ab5011ea9e64aa212d4ea52363b1b8133d5ba
>mtn: [right] b94a03a922c2c281a88d8988db64e76a32edb6a1
>mtn: conflict: missing root directory
>mtn: directory 'foo' pivoted to root on the left
>mtn: directory 'foo' deleted on the right
>mtn: conflict: orphaned directory '' from revision ead03530f5fefe50c9010157c42c0ebe18086559
>mtn: parent directory '' was deleted on the right
>mtn: directory 'bar' was renamed from '' on the left
>mtn: 1 conflict with supported resolutions.
>mtn: warning: 1 conflict with no supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:52: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 532ab5011ea9e64aa212d4ea52363b1b8133d5ba b94a03a922c2c281a88d8988db64e76a32edb6a1 missing-root
>stdout:
>stderr:
>mtn: [left]  532ab5011ea9e64aa212d4ea52363b1b8133d5ba
>mtn: [right] b94a03a922c2c281a88d8988db64e76a32edb6a1
>mtn: conflict: missing root directory
>mtn: directory 'foo' pivoted to root on the left
>mtn: directory 'foo' deleted on the right
>mtn: conflict: orphaned directory '' from revision ead03530f5fefe50c9010157c42c0ebe18086559
>mtn: parent directory '' was deleted on the right
>mtn: directory 'bar' was renamed from '' on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:55: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch missing-root
>stdout:
>stderr:
>mtn: 2 heads on branch 'missing-root'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  532ab5011ea9e64aa212d4ea52363b1b8133d5ba
>mtn: [right] b94a03a922c2c281a88d8988db64e76a32edb6a1
>mtn: conflict: missing root directory
>mtn: directory 'foo' pivoted to root on the left
>mtn: directory 'foo' deleted on the right
>mtn: conflict: orphaned directory '' from revision ead03530f5fefe50c9010157c42c0ebe18086559
>mtn: parent directory '' was deleted on the right
>mtn: directory 'bar' was renamed from '' on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:58: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision ead03530f5fefe50c9010157c42c0ebe18086559 --revision 532ab5011ea9e64aa212d4ea52363b1b8133d5ba
>stdout:
>stderr:
>mtn: [left]  469c61e13153521f9fb4dcba11cd56707556de7f
>mtn: [right] 532ab5011ea9e64aa212d4ea52363b1b8133d5ba
>mtn: conflict: missing root directory
>mtn: directory 'foo' deleted on the left
>mtn: directory 'foo' pivoted to root on the right
>mtn: conflict: orphaned directory '' from revision ead03530f5fefe50c9010157c42c0ebe18086559
>mtn: parent directory '' was deleted on the left
>mtn: directory 'bar' was renamed from '' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:61: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace 532ab5011ea9e64aa212d4ea52363b1b8133d5ba
>stdout:
>stderr:
>mtn: [left]  b94a03a922c2c281a88d8988db64e76a32edb6a1
>mtn: [right] 532ab5011ea9e64aa212d4ea52363b1b8133d5ba
>mtn: conflict: missing root directory
>mtn: directory 'foo' deleted on the left
>mtn: directory 'foo' pivoted to root on the right
>mtn: conflict: orphaned directory '' from revision ead03530f5fefe50c9010157c42c0ebe18086559
>mtn: parent directory '' was deleted on the left
>mtn: directory 'bar' was renamed from '' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:68: remove _MTN
>conflict_messages:68: remove foo
>conflict_messages:68: remove bar
>conflict_messages:68: remove baz
>conflict_messages:68: remove invalid-add
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:68: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch invalid-add
>stdout:
>stderr:
>exit code: 0
>conflict_messages:70: mkdir foo
>conflict_messages:71: writefile foo/foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:71: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo/foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>mtn: adding 'foo/foo' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:72: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch invalid-add
>stdout:
>stderr:
>mtn: beginning commit on branch 'invalid-add'
>mtn: committed revision 36e6935d3fddf349ef829125e8b6d41ea85d1db8
>exit code: 0
>conflict_messages:74: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:76: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net co --branch invalid-add invalid-add
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: function: 0x26b07a0, local_redir = false, requested = false
>conflict_messages:77: In directory invalid-add: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pivot_root foo bar
>stdout:
>stderr:
>mtn: renaming 'foo' to ''
>mtn: renaming '' to 'bar'
>exit code: 0
>stdin:
>runcmd: function: 0x2712ef0, local_redir = false, requested = false
>conflict_messages:78: In directory invalid-add: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message commit
>stdout:
>stderr:
>mtn: beginning commit on branch 'invalid-add'
>mtn: committed revision 507f1209e78415722129e65633a8d6a9dd6003f1
>exit code: 0
>conflict_messages:80: readfile _MTN/revision
>conflict_messages:82: mkdir foo/_MTN
>conflict_messages:83: writefile foo/_MTN/foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:83: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo/_MTN/foo
>stdout:
>stderr:
>mtn: adding 'foo/_MTN' to workspace manifest
>mtn: adding 'foo/_MTN/foo' to workspace manifest
>exit code: 0
>conflict_messages:84: writefile foo/_MTN/bar
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:84: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo/_MTN/bar
>stdout:
>stderr:
>mtn: adding 'foo/_MTN/bar' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:88: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'invalid-add'
>mtn: selected update target 507f1209e78415722129e65633a8d6a9dd6003f1
>mtn: [left]  334423fb913cb7455301fc4558e66499ebde7684
>mtn: [right] 507f1209e78415722129e65633a8d6a9dd6003f1
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the right
>mtn: 'foo/_MTN' added in revision 334423fb913cb7455301fc4558e66499ebde7684 on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:91: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch invalid-add-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'invalid-add-propagate'
>mtn: committed revision cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c
>exit code: 0
>conflict_messages:92: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:94: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate invalid-add invalid-add-propagate
>stdout:
>stderr:
>mtn: propagating invalid-add -> invalid-add-propagate
>mtn: [left]  507f1209e78415722129e65633a8d6a9dd6003f1
>mtn: [right] cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the left
>mtn: 'foo/_MTN' added in revision cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:96: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c branch invalid-add
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:98: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 507f1209e78415722129e65633a8d6a9dd6003f1 cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c
>stdout:
>ancestor [36e6935d3fddf349ef829125e8b6d41ea85d1db8]
>stderr:
>mtn: [left]  507f1209e78415722129e65633a8d6a9dd6003f1
>mtn: [right] cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the left
>mtn: 'foo/_MTN' added in revision cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c on the right
>mtn: 0 conflicts with supported resolutions.
>mtn: warning: 1 conflict with no supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:101: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 507f1209e78415722129e65633a8d6a9dd6003f1 cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c invalid-add
>stdout:
>stderr:
>mtn: [left]  507f1209e78415722129e65633a8d6a9dd6003f1
>mtn: [right] cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the left
>mtn: 'foo/_MTN' added in revision cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:104: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch invalid-add
>stdout:
>stderr:
>mtn: 2 heads on branch 'invalid-add'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  507f1209e78415722129e65633a8d6a9dd6003f1
>mtn: [right] cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the left
>mtn: 'foo/_MTN' added in revision cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:107: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision 36e6935d3fddf349ef829125e8b6d41ea85d1db8 --revision 507f1209e78415722129e65633a8d6a9dd6003f1
>stdout:
>stderr:
>mtn: [left]  336b56e88b99db0992da61dac1a98970389adb3c
>mtn: [right] 507f1209e78415722129e65633a8d6a9dd6003f1
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the right
>mtn: 'foo/_MTN' added in revision 336b56e88b99db0992da61dac1a98970389adb3c on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:110: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace 507f1209e78415722129e65633a8d6a9dd6003f1
>stdout:
>stderr:
>mtn: [left]  cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c
>mtn: [right] 507f1209e78415722129e65633a8d6a9dd6003f1
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the right
>mtn: 'foo/_MTN' added in revision cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:117: remove _MTN
>conflict_messages:117: remove foo
>conflict_messages:117: remove bar
>conflict_messages:117: remove baz
>conflict_messages:117: remove invalid-rename
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:117: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch invalid-rename
>stdout:
>stderr:
>exit code: 0
>conflict_messages:119: mkdir foo
>conflict_messages:120: mkdir bad
>conflict_messages:121: writefile foo/foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:121: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo/foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>mtn: adding 'foo/foo' to workspace manifest
>exit code: 0
>conflict_messages:122: writefile bad/_MTN
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:122: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add bad/_MTN
>stdout:
>stderr:
>mtn: adding 'bad' to workspace manifest
>mtn: adding 'bad/_MTN' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:123: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch invalid-rename
>stdout:
>stderr:
>mtn: beginning commit on branch 'invalid-rename'
>mtn: committed revision e7f711a68627ccae4aded5907fc80516ea1215fd
>exit code: 0
>conflict_messages:125: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:127: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net co --branch invalid-rename invalid-rename
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: function: 0x26dab70, local_redir = false, requested = false
>conflict_messages:128: In directory invalid-rename: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pivot_root foo bar
>stdout:
>stderr:
>mtn: renaming 'foo' to ''
>mtn: renaming '' to 'bar'
>exit code: 0
>stdin:
>runcmd: function: 0x26c1940, local_redir = false, requested = false
>conflict_messages:129: In directory invalid-rename: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message commit
>stdout:
>stderr:
>mtn: beginning commit on branch 'invalid-rename'
>mtn: committed revision 2bf9335ed387a7f1f082b0bc5ecdffa303d8393f
>exit code: 0
>conflict_messages:130: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:132: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv bad/_MTN foo/_MTN
>stdout:
>stderr:
>mtn: skipping 'foo', already accounted for in workspace
>mtn: renaming 'bad/_MTN' to 'foo/_MTN' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:136: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'invalid-rename'
>mtn: selected update target 2bf9335ed387a7f1f082b0bc5ecdffa303d8393f
>mtn: [left]  882d49be1940f0877d9832de4740d8f07ba3b740
>mtn: [right] 2bf9335ed387a7f1f082b0bc5ecdffa303d8393f
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the right
>mtn: 'bad/_MTN' renamed to 'foo/_MTN' on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:139: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch invalid-rename-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'invalid-rename-propagate'
>mtn: committed revision 459c32f4c7b4676d47e23aff2bd67c1e2eae5f09
>exit code: 0
>conflict_messages:140: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:142: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate invalid-rename invalid-rename-propagate
>stdout:
>stderr:
>mtn: propagating invalid-rename -> invalid-rename-propagate
>mtn: [left]  2bf9335ed387a7f1f082b0bc5ecdffa303d8393f
>mtn: [right] 459c32f4c7b4676d47e23aff2bd67c1e2eae5f09
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the left
>mtn: 'bad/_MTN' renamed to 'foo/_MTN' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:144: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert 459c32f4c7b4676d47e23aff2bd67c1e2eae5f09 branch invalid-rename
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:146: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 2bf9335ed387a7f1f082b0bc5ecdffa303d8393f 459c32f4c7b4676d47e23aff2bd67c1e2eae5f09
>stdout:
>ancestor [e7f711a68627ccae4aded5907fc80516ea1215fd]
>stderr:
>mtn: [left]  2bf9335ed387a7f1f082b0bc5ecdffa303d8393f
>mtn: [right] 459c32f4c7b4676d47e23aff2bd67c1e2eae5f09
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the left
>mtn: 'bad/_MTN' renamed to 'foo/_MTN' on the right
>mtn: 0 conflicts with supported resolutions.
>mtn: warning: 1 conflict with no supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:149: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 2bf9335ed387a7f1f082b0bc5ecdffa303d8393f 459c32f4c7b4676d47e23aff2bd67c1e2eae5f09 invalid-rename
>stdout:
>stderr:
>mtn: [left]  2bf9335ed387a7f1f082b0bc5ecdffa303d8393f
>mtn: [right] 459c32f4c7b4676d47e23aff2bd67c1e2eae5f09
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the left
>mtn: 'bad/_MTN' renamed to 'foo/_MTN' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:152: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch invalid-rename
>stdout:
>stderr:
>mtn: 2 heads on branch 'invalid-rename'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  2bf9335ed387a7f1f082b0bc5ecdffa303d8393f
>mtn: [right] 459c32f4c7b4676d47e23aff2bd67c1e2eae5f09
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the left
>mtn: 'bad/_MTN' renamed to 'foo/_MTN' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:155: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision e7f711a68627ccae4aded5907fc80516ea1215fd --revision 2bf9335ed387a7f1f082b0bc5ecdffa303d8393f
>stdout:
>stderr:
>mtn: [left]  4099a803104f5f44cff85d75a585fc318615f325
>mtn: [right] 2bf9335ed387a7f1f082b0bc5ecdffa303d8393f
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the right
>mtn: 'bad/_MTN' renamed to 'foo/_MTN' on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:158: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace 2bf9335ed387a7f1f082b0bc5ecdffa303d8393f
>stdout:
>stderr:
>mtn: [left]  459c32f4c7b4676d47e23aff2bd67c1e2eae5f09
>mtn: [right] 2bf9335ed387a7f1f082b0bc5ecdffa303d8393f
>mtn: conflict: invalid name '_MTN' in root directory
>mtn: 'foo' pivoted to root on the right
>mtn: 'bad/_MTN' renamed to 'foo/_MTN' on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:166: remove _MTN
>conflict_messages:166: remove foo
>conflict_messages:166: remove bar
>conflict_messages:166: remove baz
>conflict_messages:166: remove directory-loop
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:166: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch directory-loop
>stdout:
>stderr:
>exit code: 0
>conflict_messages:168: mkdir foo
>conflict_messages:169: mkdir bar
>conflict_messages:170: writefile foo/foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:170: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo/foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>mtn: adding 'foo/foo' to workspace manifest
>exit code: 0
>conflict_messages:171: writefile bar/bar
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:171: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add bar/bar
>stdout:
>stderr:
>mtn: adding 'bar' to workspace manifest
>mtn: adding 'bar/bar' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:172: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch directory-loop
>stdout:
>stderr:
>mtn: beginning commit on branch 'directory-loop'
>mtn: committed revision 08ccbb14523a09d342568ce27a1b9f631d42aa9c
>exit code: 0
>conflict_messages:174: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:176: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo bar
>stdout:
>stderr:
>mtn: skipping 'bar', already accounted for in workspace
>mtn: renaming 'foo' to 'bar/foo' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:177: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch directory-loop
>stdout:
>stderr:
>mtn: beginning commit on branch 'directory-loop'
>mtn: committed revision be04cb44902df12f3b36bf0efabba784547ccd34
>exit code: 0
>conflict_messages:178: readfile _MTN/revision
>conflict_messages:180: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:180: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of be04cb44902df12f3b36bf0efabba784547ccd34
>stdout:
>format_version "1"
>dir ""
>dir "bar"
>   file "bar/bar"
>content [76492537ac8cee3272c07a07685fe544bdb58037]
>dir "bar/foo"
>   file "bar/foo/foo"
>content [4ed5ab0a1b7eb271e6158edc181e92f4a9084e69]
>stderr:
>exit code: 0
>conflict_messages:180: rename stdout paths-new
>conflict_messages:180: remove _MTN.old
>conflict_messages:180: rename _MTN _MTN.old
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:180: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 08ccbb14523a09d342568ce27a1b9f631d42aa9c
>stdout:
>format_version "1"
>dir ""
>dir "bar"
>   file "bar/bar"
>content [76492537ac8cee3272c07a07685fe544bdb58037]
>dir "foo"
>   file "foo/foo"
>content [4ed5ab0a1b7eb271e6158edc181e92f4a9084e69]
>stderr:
>exit code: 0
>conflict_messages:180: rename stdout paths-old
>conflict_messages:180: remove bar
>conflict_messages:180: remove bar/bar
>conflict_messages:180: remove bar/foo
>conflict_messages:180: remove bar/foo/foo
>conflict_messages:180: remove bar
>conflict_messages:180: remove bar/bar
>conflict_messages:180: remove foo
>conflict_messages:180: remove foo/foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:180: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net checkout --revision 08ccbb14523a09d342568ce27a1b9f631d42aa9c .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:180: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:182: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv bar foo
>stdout:
>stderr:
>mtn: skipping 'foo', already accounted for in workspace
>mtn: renaming 'bar' to 'foo/bar' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:185: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'directory-loop'
>mtn: selected update target be04cb44902df12f3b36bf0efabba784547ccd34
>mtn: [left]  c18a0ed49d17174331c41644e10986c580a9b6f8
>mtn: [right] be04cb44902df12f3b36bf0efabba784547ccd34
>mtn: conflict: directory loop created
>mtn: 'foo' renamed to 'bar/foo' on the right
>mtn: 'bar' renamed to 'foo/bar' on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:188: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch directory-loop-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'directory-loop-propagate'
>mtn: committed revision 7cd48d9599eee2a67e8c510112659c0d313fb1df
>exit code: 0
>conflict_messages:189: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:191: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate directory-loop directory-loop-propagate
>stdout:
>stderr:
>mtn: propagating directory-loop -> directory-loop-propagate
>mtn: [left]  be04cb44902df12f3b36bf0efabba784547ccd34
>mtn: [right] 7cd48d9599eee2a67e8c510112659c0d313fb1df
>mtn: conflict: directory loop created
>mtn: 'foo' renamed to 'bar/foo' on the left
>mtn: 'bar' renamed to 'foo/bar' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:193: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert 7cd48d9599eee2a67e8c510112659c0d313fb1df branch directory-loop
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:195: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts be04cb44902df12f3b36bf0efabba784547ccd34 7cd48d9599eee2a67e8c510112659c0d313fb1df
>stdout:
>ancestor [08ccbb14523a09d342568ce27a1b9f631d42aa9c]
>stderr:
>mtn: [left]  be04cb44902df12f3b36bf0efabba784547ccd34
>mtn: [right] 7cd48d9599eee2a67e8c510112659c0d313fb1df
>mtn: conflict: directory loop created
>mtn: 'foo' renamed to 'bar/foo' on the left
>mtn: 'bar' renamed to 'foo/bar' on the right
>mtn: 0 conflicts with supported resolutions.
>mtn: warning: 1 conflict with no supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:198: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge be04cb44902df12f3b36bf0efabba784547ccd34 7cd48d9599eee2a67e8c510112659c0d313fb1df directory-loop
>stdout:
>stderr:
>mtn: [left]  be04cb44902df12f3b36bf0efabba784547ccd34
>mtn: [right] 7cd48d9599eee2a67e8c510112659c0d313fb1df
>mtn: conflict: directory loop created
>mtn: 'foo' renamed to 'bar/foo' on the left
>mtn: 'bar' renamed to 'foo/bar' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:201: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch directory-loop
>stdout:
>stderr:
>mtn: 2 heads on branch 'directory-loop'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  7cd48d9599eee2a67e8c510112659c0d313fb1df
>mtn: [right] be04cb44902df12f3b36bf0efabba784547ccd34
>mtn: conflict: directory loop created
>mtn: 'foo' renamed to 'bar/foo' on the right
>mtn: 'bar' renamed to 'foo/bar' on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:204: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision 08ccbb14523a09d342568ce27a1b9f631d42aa9c --revision be04cb44902df12f3b36bf0efabba784547ccd34
>stdout:
>stderr:
>mtn: [left]  76ec8dcfdfb4deb368690737e91023febf271e89
>mtn: [right] be04cb44902df12f3b36bf0efabba784547ccd34
>mtn: conflict: directory loop created
>mtn: 'foo' renamed to 'bar/foo' on the right
>mtn: 'bar' renamed to 'foo/bar' on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:207: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace be04cb44902df12f3b36bf0efabba784547ccd34
>stdout:
>stderr:
>mtn: [left]  7cd48d9599eee2a67e8c510112659c0d313fb1df
>mtn: [right] be04cb44902df12f3b36bf0efabba784547ccd34
>mtn: conflict: directory loop created
>mtn: 'foo' renamed to 'bar/foo' on the right
>mtn: 'bar' renamed to 'foo/bar' on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:215: remove _MTN
>conflict_messages:215: remove foo
>conflict_messages:215: remove bar
>conflict_messages:215: remove baz
>conflict_messages:215: remove orphaned-add
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:215: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch orphaned-add
>stdout:
>stderr:
>exit code: 0
>conflict_messages:217: mkdir foo
>conflict_messages:218: writefile foo/foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:218: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo/foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>mtn: adding 'foo/foo' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:219: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch orphaned-add
>stdout:
>stderr:
>mtn: beginning commit on branch 'orphaned-add'
>mtn: committed revision cce148761e33b0abbaa1c072ee913dcc23d7bfc3
>exit code: 0
>conflict_messages:221: readfile _MTN/revision
>conflict_messages:223: writefile foo/bar
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:223: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo/bar
>stdout:
>stderr:
>mtn: adding 'foo/bar' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:224: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch orphaned-add
>stdout:
>stderr:
>mtn: beginning commit on branch 'orphaned-add'
>mtn: committed revision efb0fbbaad55564248c9aa2d7b8154d7aa02031a
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:226: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo/bar foo/baz
>stdout:
>stderr:
>mtn: skipping 'foo', already accounted for in workspace
>mtn: renaming 'foo/bar' to 'foo/baz' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:227: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch orphaned-add
>stdout:
>stderr:
>mtn: beginning commit on branch 'orphaned-add'
>mtn: committed revision 140a1d712e5e7368dc88766144e0975746f27b9a
>exit code: 0
>conflict_messages:228: readfile _MTN/revision
>conflict_messages:230: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:230: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 140a1d712e5e7368dc88766144e0975746f27b9a
>stdout:
>format_version "1"
>dir ""
>dir "foo"
>   file "foo/baz"
>content [f5122a7f896cb2dd7ecaa84be89c94ab09c15101]
>   file "foo/foo"
>content [64d77cba57c33de2535cee7165af2bf4f8de57f2]
>stderr:
>exit code: 0
>conflict_messages:230: rename stdout paths-new
>Destination paths-new exists; removing...
>conflict_messages:230: remove _MTN.old
>conflict_messages:230: rename _MTN _MTN.old
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:230: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of cce148761e33b0abbaa1c072ee913dcc23d7bfc3
>stdout:
>format_version "1"
>dir ""
>dir "foo"
>   file "foo/foo"
>content [64d77cba57c33de2535cee7165af2bf4f8de57f2]
>stderr:
>exit code: 0
>conflict_messages:230: rename stdout paths-old
>Destination paths-old exists; removing...
>conflict_messages:230: remove foo
>conflict_messages:230: remove foo/baz
>conflict_messages:230: remove foo/foo
>conflict_messages:230: remove foo
>conflict_messages:230: remove foo/foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:230: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net checkout --revision cce148761e33b0abbaa1c072ee913dcc23d7bfc3 .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:230: readfile _MTN/revision
>conflict_messages:232: remove foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:233: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net drop --recursive foo
>stdout:
>stderr:
>mtn: dropping 'foo/foo' from workspace manifest
>mtn: dropping 'foo' from workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:237: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'orphaned-add'
>mtn: selected update target 140a1d712e5e7368dc88766144e0975746f27b9a
>mtn: [left]  84df545de974536bc268162826d9564d9907a0d4
>mtn: [right] 140a1d712e5e7368dc88766144e0975746f27b9a
>mtn: conflict: orphaned file 'foo/baz' from revision 140a1d712e5e7368dc88766144e0975746f27b9a
>mtn: parent directory 'foo' was deleted on the left
>mtn: file 'foo/baz' was added on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:240: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch orphaned-add-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'orphaned-add-propagate'
>mtn: committed revision 872259407b5e1445c6b463768243ddaf531bd73a
>exit code: 0
>conflict_messages:241: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:243: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate orphaned-add orphaned-add-propagate
>stdout:
>stderr:
>mtn: propagating orphaned-add -> orphaned-add-propagate
>mtn: [left]  140a1d712e5e7368dc88766144e0975746f27b9a
>mtn: [right] 872259407b5e1445c6b463768243ddaf531bd73a
>mtn: conflict: orphaned file 'foo/bar' from revision efb0fbbaad55564248c9aa2d7b8154d7aa02031a
>mtn: parent directory 'foo' was deleted on the right
>mtn: file 'foo/baz' was added on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:245: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert 872259407b5e1445c6b463768243ddaf531bd73a branch orphaned-add
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:247: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 140a1d712e5e7368dc88766144e0975746f27b9a 872259407b5e1445c6b463768243ddaf531bd73a
>stdout:
>ancestor [cce148761e33b0abbaa1c072ee913dcc23d7bfc3]
>stderr:
>mtn: [left]  140a1d712e5e7368dc88766144e0975746f27b9a
>mtn: [right] 872259407b5e1445c6b463768243ddaf531bd73a
>mtn: conflict: orphaned file 'foo/bar' from revision efb0fbbaad55564248c9aa2d7b8154d7aa02031a
>mtn: parent directory 'foo' was deleted on the right
>mtn: file 'foo/baz' was added on the left
>mtn: 1 conflict with supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:250: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 140a1d712e5e7368dc88766144e0975746f27b9a 872259407b5e1445c6b463768243ddaf531bd73a orphaned-add
>stdout:
>stderr:
>mtn: [left]  140a1d712e5e7368dc88766144e0975746f27b9a
>mtn: [right] 872259407b5e1445c6b463768243ddaf531bd73a
>mtn: conflict: orphaned file 'foo/bar' from revision efb0fbbaad55564248c9aa2d7b8154d7aa02031a
>mtn: parent directory 'foo' was deleted on the right
>mtn: file 'foo/baz' was added on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:253: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch orphaned-add
>stdout:
>stderr:
>mtn: 2 heads on branch 'orphaned-add'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  140a1d712e5e7368dc88766144e0975746f27b9a
>mtn: [right] 872259407b5e1445c6b463768243ddaf531bd73a
>mtn: conflict: orphaned file 'foo/bar' from revision efb0fbbaad55564248c9aa2d7b8154d7aa02031a
>mtn: parent directory 'foo' was deleted on the right
>mtn: file 'foo/baz' was added on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:256: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision cce148761e33b0abbaa1c072ee913dcc23d7bfc3 --revision 140a1d712e5e7368dc88766144e0975746f27b9a
>stdout:
>stderr:
>mtn: [left]  d74977652e7ed741b6184cbe3e5f0fc8f71d72ef
>mtn: [right] 140a1d712e5e7368dc88766144e0975746f27b9a
>mtn: conflict: orphaned file 'foo/baz' from revision 140a1d712e5e7368dc88766144e0975746f27b9a
>mtn: parent directory 'foo' was deleted on the left
>mtn: file 'foo/baz' was added on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:259: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace 140a1d712e5e7368dc88766144e0975746f27b9a
>stdout:
>stderr:
>mtn: [left]  872259407b5e1445c6b463768243ddaf531bd73a
>mtn: [right] 140a1d712e5e7368dc88766144e0975746f27b9a
>mtn: conflict: orphaned file 'foo/bar' from revision efb0fbbaad55564248c9aa2d7b8154d7aa02031a
>mtn: parent directory 'foo' was deleted on the left
>mtn: file 'foo/baz' was added on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:266: remove _MTN
>conflict_messages:266: remove foo
>conflict_messages:266: remove bar
>conflict_messages:266: remove baz
>conflict_messages:266: remove orphaned-rename
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:266: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch orphaned-rename
>stdout:
>stderr:
>exit code: 0
>conflict_messages:268: mkdir foo
>conflict_messages:269: writefile foo/foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:269: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo/foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>mtn: adding 'foo/foo' to workspace manifest
>exit code: 0
>conflict_messages:270: writefile bar
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:270: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add bar
>stdout:
>stderr:
>mtn: adding 'bar' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:271: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch orphaned-rename
>stdout:
>stderr:
>mtn: beginning commit on branch 'orphaned-rename'
>mtn: committed revision b5f52dbc0dc530adffbdd140a7de5b129cf74f29
>exit code: 0
>conflict_messages:273: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:275: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv bar foo/bar
>stdout:
>stderr:
>mtn: skipping 'foo', already accounted for in workspace
>mtn: renaming 'bar' to 'foo/bar' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:276: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch orphaned-rename
>stdout:
>stderr:
>mtn: beginning commit on branch 'orphaned-rename'
>mtn: committed revision 0e958233439000ab1a45ddd6eacf9844490c7eb6
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:277: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo/bar foo/baz
>stdout:
>stderr:
>mtn: skipping 'foo', already accounted for in workspace
>mtn: renaming 'foo/bar' to 'foo/baz' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:278: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch orphaned-rename
>stdout:
>stderr:
>mtn: beginning commit on branch 'orphaned-rename'
>mtn: committed revision 4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7
>exit code: 0
>conflict_messages:279: readfile _MTN/revision
>conflict_messages:281: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:281: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7
>stdout:
>format_version "1"
>dir ""
>dir "foo"
>   file "foo/baz"
>content [ac4c6d06436632e017bb7d3ea241734e8899f8ce]
>   file "foo/foo"
>content [2134f7bd85bc9e11fbfed753a238dc1324da5acb]
>stderr:
>exit code: 0
>conflict_messages:281: rename stdout paths-new
>Destination paths-new exists; removing...
>conflict_messages:281: remove _MTN.old
>conflict_messages:281: rename _MTN _MTN.old
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:281: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of b5f52dbc0dc530adffbdd140a7de5b129cf74f29
>stdout:
>format_version "1"
>dir ""
>   file "bar"
>content [ac4c6d06436632e017bb7d3ea241734e8899f8ce]
>dir "foo"
>   file "foo/foo"
>content [2134f7bd85bc9e11fbfed753a238dc1324da5acb]
>stderr:
>exit code: 0
>conflict_messages:281: rename stdout paths-old
>Destination paths-old exists; removing...
>conflict_messages:281: remove foo
>conflict_messages:281: remove foo/baz
>conflict_messages:281: remove foo/foo
>conflict_messages:281: remove bar
>conflict_messages:281: remove foo
>conflict_messages:281: remove foo/foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:281: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net checkout --revision b5f52dbc0dc530adffbdd140a7de5b129cf74f29 .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:281: readfile _MTN/revision
>conflict_messages:283: remove foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:284: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net drop --recursive foo
>stdout:
>stderr:
>mtn: dropping 'foo/foo' from workspace manifest
>mtn: dropping 'foo' from workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:288: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'orphaned-rename'
>mtn: selected update target 4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7
>mtn: [left]  f557c156931245fea2c57a54b19e9ab97618e900
>mtn: [right] 4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7
>mtn: conflict: orphaned file 'bar' from revision b5f52dbc0dc530adffbdd140a7de5b129cf74f29
>mtn: parent directory 'foo' was deleted on the left
>mtn: file 'foo/baz' was renamed from 'bar' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:291: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch orphaned-rename-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'orphaned-rename-propagate'
>mtn: committed revision 16a19ace8ec26cd2ed13c7e727a3021e82a2204f
>exit code: 0
>conflict_messages:292: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:294: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate orphaned-rename orphaned-rename-propagate
>stdout:
>stderr:
>mtn: propagating orphaned-rename -> orphaned-rename-propagate
>mtn: [left]  4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7
>mtn: [right] 16a19ace8ec26cd2ed13c7e727a3021e82a2204f
>mtn: conflict: orphaned file 'bar' from revision b5f52dbc0dc530adffbdd140a7de5b129cf74f29
>mtn: parent directory 'foo' was deleted on the right
>mtn: file 'foo/baz' was renamed from 'bar' on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:296: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert 16a19ace8ec26cd2ed13c7e727a3021e82a2204f branch orphaned-rename
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:298: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7 16a19ace8ec26cd2ed13c7e727a3021e82a2204f
>stdout:
>ancestor [b5f52dbc0dc530adffbdd140a7de5b129cf74f29]
>stderr:
>mtn: [left]  4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7
>mtn: [right] 16a19ace8ec26cd2ed13c7e727a3021e82a2204f
>mtn: conflict: orphaned file 'bar' from revision b5f52dbc0dc530adffbdd140a7de5b129cf74f29
>mtn: parent directory 'foo' was deleted on the right
>mtn: file 'foo/baz' was renamed from 'bar' on the left
>mtn: 1 conflict with supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:301: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7 16a19ace8ec26cd2ed13c7e727a3021e82a2204f orphaned-rename
>stdout:
>stderr:
>mtn: [left]  4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7
>mtn: [right] 16a19ace8ec26cd2ed13c7e727a3021e82a2204f
>mtn: conflict: orphaned file 'bar' from revision b5f52dbc0dc530adffbdd140a7de5b129cf74f29
>mtn: parent directory 'foo' was deleted on the right
>mtn: file 'foo/baz' was renamed from 'bar' on the left
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:304: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch orphaned-rename
>stdout:
>stderr:
>mtn: 2 heads on branch 'orphaned-rename'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  16a19ace8ec26cd2ed13c7e727a3021e82a2204f
>mtn: [right] 4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7
>mtn: conflict: orphaned file 'bar' from revision b5f52dbc0dc530adffbdd140a7de5b129cf74f29
>mtn: parent directory 'foo' was deleted on the left
>mtn: file 'foo/baz' was renamed from 'bar' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:307: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision b5f52dbc0dc530adffbdd140a7de5b129cf74f29 --revision 4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7
>stdout:
>stderr:
>mtn: [left]  d14ea8b31668d40a2f0f816381e9d15a240ff0d5
>mtn: [right] 4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7
>mtn: conflict: orphaned file 'bar' from revision b5f52dbc0dc530adffbdd140a7de5b129cf74f29
>mtn: parent directory 'foo' was deleted on the left
>mtn: file 'foo/baz' was renamed from 'bar' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:310: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace 4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7
>stdout:
>stderr:
>mtn: [left]  16a19ace8ec26cd2ed13c7e727a3021e82a2204f
>mtn: [right] 4ceae2a74d9d0d7341d2cd01a71c9e84eb1fefa7
>mtn: conflict: orphaned file 'bar' from revision b5f52dbc0dc530adffbdd140a7de5b129cf74f29
>mtn: parent directory 'foo' was deleted on the left
>mtn: file 'foo/baz' was renamed from 'bar' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:318: remove _MTN
>conflict_messages:318: remove foo
>conflict_messages:318: remove bar
>conflict_messages:318: remove baz
>conflict_messages:318: remove multiple-names
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:318: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch multiple-names
>stdout:
>stderr:
>exit code: 0
>conflict_messages:320: writefile foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:320: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:321: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch multiple-names
>stdout:
>stderr:
>mtn: beginning commit on branch 'multiple-names'
>mtn: committed revision 560b97068441495b17d8924f6122a1c47213a08b
>exit code: 0
>conflict_messages:322: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:324: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo bar
>stdout:
>stderr:
>mtn: renaming 'foo' to 'bar' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:325: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch multiple-names
>stdout:
>stderr:
>mtn: beginning commit on branch 'multiple-names'
>mtn: committed revision 872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31
>exit code: 0
>conflict_messages:326: readfile _MTN/revision
>conflict_messages:328: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:328: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31
>stdout:
>format_version "1"
>dir ""
>   file "bar"
>content [3dc9e2f630ea9c3e60e8947d41c4150b88340ea0]
>stderr:
>exit code: 0
>conflict_messages:328: rename stdout paths-new
>Destination paths-new exists; removing...
>conflict_messages:328: remove _MTN.old
>conflict_messages:328: rename _MTN _MTN.old
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:328: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 560b97068441495b17d8924f6122a1c47213a08b
>stdout:
>format_version "1"
>dir ""
>   file "foo"
>content [3dc9e2f630ea9c3e60e8947d41c4150b88340ea0]
>stderr:
>exit code: 0
>conflict_messages:328: rename stdout paths-old
>Destination paths-old exists; removing...
>conflict_messages:328: remove bar
>conflict_messages:328: remove foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:328: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net checkout --revision 560b97068441495b17d8924f6122a1c47213a08b .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:328: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:330: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo baz
>stdout:
>stderr:
>mtn: renaming 'foo' to 'baz' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:334: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'multiple-names'
>mtn: selected update target 872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31
>mtn: [left]  d42e1bae1a0ff977841d51380bc84c950dc60f7d
>mtn: [right] 872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31
>mtn: conflict: multiple names for file 'foo' from revision 560b97068441495b17d8924f6122a1c47213a08b
>mtn: renamed to 'baz' on the left
>mtn: renamed to 'bar' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:337: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch multiple-names-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'multiple-names-propagate'
>mtn: committed revision bf62726ad7c36e553cb8906906866962786e52c0
>exit code: 0
>conflict_messages:338: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:340: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate multiple-names multiple-names-propagate
>stdout:
>stderr:
>mtn: propagating multiple-names -> multiple-names-propagate
>mtn: [left]  872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31
>mtn: [right] bf62726ad7c36e553cb8906906866962786e52c0
>mtn: conflict: multiple names for file 'foo' from revision 560b97068441495b17d8924f6122a1c47213a08b
>mtn: renamed to 'bar' on the left
>mtn: renamed to 'baz' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:342: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert bf62726ad7c36e553cb8906906866962786e52c0 branch multiple-names
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:344: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31 bf62726ad7c36e553cb8906906866962786e52c0
>stdout:
>ancestor [560b97068441495b17d8924f6122a1c47213a08b]
>stderr:
>mtn: [left]  872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31
>mtn: [right] bf62726ad7c36e553cb8906906866962786e52c0
>mtn: conflict: multiple names for file 'foo' from revision 560b97068441495b17d8924f6122a1c47213a08b
>mtn: renamed to 'bar' on the left
>mtn: renamed to 'baz' on the right
>mtn: 0 conflicts with supported resolutions.
>mtn: warning: 1 conflict with no supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:347: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31 bf62726ad7c36e553cb8906906866962786e52c0 multiple-names
>stdout:
>stderr:
>mtn: [left]  872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31
>mtn: [right] bf62726ad7c36e553cb8906906866962786e52c0
>mtn: conflict: multiple names for file 'foo' from revision 560b97068441495b17d8924f6122a1c47213a08b
>mtn: renamed to 'bar' on the left
>mtn: renamed to 'baz' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:350: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch multiple-names
>stdout:
>stderr:
>mtn: 2 heads on branch 'multiple-names'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31
>mtn: [right] bf62726ad7c36e553cb8906906866962786e52c0
>mtn: conflict: multiple names for file 'foo' from revision 560b97068441495b17d8924f6122a1c47213a08b
>mtn: renamed to 'bar' on the left
>mtn: renamed to 'baz' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:353: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision 560b97068441495b17d8924f6122a1c47213a08b --revision 872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31
>stdout:
>stderr:
>mtn: [left]  80b22a6d4622267c1fc60fd53a331112397c4472
>mtn: [right] 872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31
>mtn: conflict: multiple names for file 'foo' from revision 560b97068441495b17d8924f6122a1c47213a08b
>mtn: renamed to 'baz' on the left
>mtn: renamed to 'bar' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:356: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace 872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31
>stdout:
>stderr:
>mtn: [left]  bf62726ad7c36e553cb8906906866962786e52c0
>mtn: [right] 872b02c3aaa3b8ee6acf7e00e67108d5aaa8cb31
>mtn: conflict: multiple names for file 'foo' from revision 560b97068441495b17d8924f6122a1c47213a08b
>mtn: renamed to 'baz' on the left
>mtn: renamed to 'bar' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:364: remove _MTN
>conflict_messages:364: remove foo
>conflict_messages:364: remove bar
>conflict_messages:364: remove baz
>conflict_messages:364: remove duplicate-adds
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:364: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch duplicate-adds
>stdout:
>stderr:
>exit code: 0
>conflict_messages:366: writefile foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:366: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:367: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch duplicate-adds
>stdout:
>stderr:
>mtn: beginning commit on branch 'duplicate-adds'
>mtn: committed revision 56cafb3485be6d40923bacaddcd19cde63433028
>exit code: 0
>conflict_messages:368: readfile _MTN/revision
>conflict_messages:370: writefile xxx
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:370: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add xxx
>stdout:
>stderr:
>mtn: adding 'xxx' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:371: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch duplicate-adds
>stdout:
>stderr:
>mtn: beginning commit on branch 'duplicate-adds'
>mtn: committed revision dd95e3dae11ca56a59b93e72db9bd22781f5c9e9
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:373: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv xxx bar
>stdout:
>stderr:
>mtn: renaming 'xxx' to 'bar' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:375: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch duplicate-adds
>stdout:
>stderr:
>mtn: beginning commit on branch 'duplicate-adds'
>mtn: committed revision 36e62406e9792ad64f7af73c5192d2e4e53306c8
>exit code: 0
>conflict_messages:376: readfile _MTN/revision
>conflict_messages:378: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:378: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 36e62406e9792ad64f7af73c5192d2e4e53306c8
>stdout:
>format_version "1"
>dir ""
>   file "bar"
>content [ba4637112ee3e55a6106d647d6c4e04a6643f8eb]
>   file "foo"
>content [102516f8482d4e0c07c574d5848a41a664d61ba7]
>stderr:
>exit code: 0
>conflict_messages:378: rename stdout paths-new
>Destination paths-new exists; removing...
>conflict_messages:378: remove _MTN.old
>conflict_messages:378: rename _MTN _MTN.old
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:378: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 56cafb3485be6d40923bacaddcd19cde63433028
>stdout:
>format_version "1"
>dir ""
>   file "foo"
>content [102516f8482d4e0c07c574d5848a41a664d61ba7]
>stderr:
>exit code: 0
>conflict_messages:378: rename stdout paths-old
>Destination paths-old exists; removing...
>conflict_messages:378: remove bar
>conflict_messages:378: remove foo
>conflict_messages:378: remove foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:378: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net checkout --revision 56cafb3485be6d40923bacaddcd19cde63433028 .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:378: readfile _MTN/revision
>conflict_messages:380: writefile bar
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:380: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add bar
>stdout:
>stderr:
>mtn: adding 'bar' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:384: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'duplicate-adds'
>mtn: selected update target 36e62406e9792ad64f7af73c5192d2e4e53306c8
>mtn: [left]  12f3e690a28e332b837becb9ad7588bcba0dca14
>mtn: [right] 36e62406e9792ad64f7af73c5192d2e4e53306c8
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: added as a new file on the left
>mtn: added as a new file on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:387: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch duplicate-adds-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'duplicate-adds-propagate'
>mtn: committed revision 2b96f8e6ed2bb566c22ebcbdd06d34d1043c237f
>exit code: 0
>conflict_messages:388: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:390: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate duplicate-adds duplicate-adds-propagate
>stdout:
>stderr:
>mtn: propagating duplicate-adds -> duplicate-adds-propagate
>mtn: [left]  36e62406e9792ad64f7af73c5192d2e4e53306c8
>mtn: [right] 2b96f8e6ed2bb566c22ebcbdd06d34d1043c237f
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: added as a new file on the left
>mtn: added as a new file on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:392: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert 2b96f8e6ed2bb566c22ebcbdd06d34d1043c237f branch duplicate-adds
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:394: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 36e62406e9792ad64f7af73c5192d2e4e53306c8 2b96f8e6ed2bb566c22ebcbdd06d34d1043c237f
>stdout:
>ancestor [56cafb3485be6d40923bacaddcd19cde63433028]
>stderr:
>mtn: [left]  36e62406e9792ad64f7af73c5192d2e4e53306c8
>mtn: [right] 2b96f8e6ed2bb566c22ebcbdd06d34d1043c237f
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: added as a new file on the left
>mtn: added as a new file on the right
>mtn: 1 conflict with supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:397: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 36e62406e9792ad64f7af73c5192d2e4e53306c8 2b96f8e6ed2bb566c22ebcbdd06d34d1043c237f duplicate-adds
>stdout:
>stderr:
>mtn: [left]  36e62406e9792ad64f7af73c5192d2e4e53306c8
>mtn: [right] 2b96f8e6ed2bb566c22ebcbdd06d34d1043c237f
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: added as a new file on the left
>mtn: added as a new file on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:400: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch duplicate-adds
>stdout:
>stderr:
>mtn: 2 heads on branch 'duplicate-adds'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  2b96f8e6ed2bb566c22ebcbdd06d34d1043c237f
>mtn: [right] 36e62406e9792ad64f7af73c5192d2e4e53306c8
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: added as a new file on the left
>mtn: added as a new file on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:403: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision 56cafb3485be6d40923bacaddcd19cde63433028 --revision 36e62406e9792ad64f7af73c5192d2e4e53306c8
>stdout:
>stderr:
>mtn: [left]  90eccd4687a4301546ae34980ecdf858ae8071ea
>mtn: [right] 36e62406e9792ad64f7af73c5192d2e4e53306c8
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: added as a new file on the left
>mtn: added as a new file on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:406: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace 36e62406e9792ad64f7af73c5192d2e4e53306c8
>stdout:
>stderr:
>mtn: [left]  2b96f8e6ed2bb566c22ebcbdd06d34d1043c237f
>mtn: [right] 36e62406e9792ad64f7af73c5192d2e4e53306c8
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: added as a new file on the left
>mtn: added as a new file on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:413: remove _MTN
>conflict_messages:413: remove foo
>conflict_messages:413: remove bar
>conflict_messages:413: remove baz
>conflict_messages:413: remove duplicate-renames
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:413: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch duplicate-renames
>stdout:
>stderr:
>exit code: 0
>conflict_messages:415: writefile foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:415: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>exit code: 0
>conflict_messages:416: writefile bar
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:416: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add bar
>stdout:
>stderr:
>mtn: adding 'bar' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:418: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch duplicate-renames
>stdout:
>stderr:
>mtn: beginning commit on branch 'duplicate-renames'
>mtn: committed revision 680280e4dcc9fcf60721e6ac9157d98ac5f94c37
>exit code: 0
>conflict_messages:419: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:421: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo abc
>stdout:
>stderr:
>mtn: renaming 'foo' to 'abc' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:422: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch duplicate-renames
>stdout:
>stderr:
>mtn: beginning commit on branch 'duplicate-renames'
>mtn: committed revision 1fc2275efef8645a25e267ae47686e57e50ca1e1
>exit code: 0
>conflict_messages:423: readfile _MTN/revision
>conflict_messages:425: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:425: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 1fc2275efef8645a25e267ae47686e57e50ca1e1
>stdout:
>format_version "1"
>dir ""
>   file "abc"
>content [918f3642b57a5e2dd13ee874e3dc2518a53ab4b4]
>   file "bar"
>content [bdf46a521d5f1dd54c31dda15e99ff6b0c80394a]
>stderr:
>exit code: 0
>conflict_messages:425: rename stdout paths-new
>Destination paths-new exists; removing...
>conflict_messages:425: remove _MTN.old
>conflict_messages:425: rename _MTN _MTN.old
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:425: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 680280e4dcc9fcf60721e6ac9157d98ac5f94c37
>stdout:
>format_version "1"
>dir ""
>   file "bar"
>content [bdf46a521d5f1dd54c31dda15e99ff6b0c80394a]
>   file "foo"
>content [918f3642b57a5e2dd13ee874e3dc2518a53ab4b4]
>stderr:
>exit code: 0
>conflict_messages:425: rename stdout paths-old
>Destination paths-old exists; removing...
>conflict_messages:425: remove abc
>conflict_messages:425: remove bar
>conflict_messages:425: remove bar
>conflict_messages:425: remove foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:425: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net checkout --revision 680280e4dcc9fcf60721e6ac9157d98ac5f94c37 .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:425: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:427: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv bar abc
>stdout:
>stderr:
>mtn: renaming 'bar' to 'abc' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:431: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'duplicate-renames'
>mtn: selected update target 1fc2275efef8645a25e267ae47686e57e50ca1e1
>mtn: [left]  dd467a0edd4f0e489ede51441f4713901b9562cc
>mtn: [right] 1fc2275efef8645a25e267ae47686e57e50ca1e1
>mtn: conflict: duplicate name 'abc' for the directory ''
>mtn: renamed from file 'bar' on the left
>mtn: renamed from file 'foo' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:434: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch duplicate-renames-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'duplicate-renames-propagate'
>mtn: committed revision 497d6e99c8b79ef5848aa862154f496432f07709
>exit code: 0
>conflict_messages:435: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:437: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate duplicate-renames duplicate-renames-propagate
>stdout:
>stderr:
>mtn: propagating duplicate-renames -> duplicate-renames-propagate
>mtn: [left]  1fc2275efef8645a25e267ae47686e57e50ca1e1
>mtn: [right] 497d6e99c8b79ef5848aa862154f496432f07709
>mtn: conflict: duplicate name 'abc' for the directory ''
>mtn: renamed from file 'foo' on the left
>mtn: renamed from file 'bar' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:439: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert 497d6e99c8b79ef5848aa862154f496432f07709 branch duplicate-renames
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:441: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 1fc2275efef8645a25e267ae47686e57e50ca1e1 497d6e99c8b79ef5848aa862154f496432f07709
>stdout:
>ancestor [680280e4dcc9fcf60721e6ac9157d98ac5f94c37]
>stderr:
>mtn: [left]  1fc2275efef8645a25e267ae47686e57e50ca1e1
>mtn: [right] 497d6e99c8b79ef5848aa862154f496432f07709
>mtn: conflict: duplicate name 'abc' for the directory ''
>mtn: renamed from file 'foo' on the left
>mtn: renamed from file 'bar' on the right
>mtn: 1 conflict with supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:444: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 1fc2275efef8645a25e267ae47686e57e50ca1e1 497d6e99c8b79ef5848aa862154f496432f07709 duplicate-renames
>stdout:
>stderr:
>mtn: [left]  1fc2275efef8645a25e267ae47686e57e50ca1e1
>mtn: [right] 497d6e99c8b79ef5848aa862154f496432f07709
>mtn: conflict: duplicate name 'abc' for the directory ''
>mtn: renamed from file 'foo' on the left
>mtn: renamed from file 'bar' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:447: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch duplicate-renames
>stdout:
>stderr:
>mtn: 2 heads on branch 'duplicate-renames'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  1fc2275efef8645a25e267ae47686e57e50ca1e1
>mtn: [right] 497d6e99c8b79ef5848aa862154f496432f07709
>mtn: conflict: duplicate name 'abc' for the directory ''
>mtn: renamed from file 'foo' on the left
>mtn: renamed from file 'bar' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:450: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision 680280e4dcc9fcf60721e6ac9157d98ac5f94c37 --revision 1fc2275efef8645a25e267ae47686e57e50ca1e1
>stdout:
>stderr:
>mtn: [left]  d820712eb6db955d60e37e177ad8b770eaaa3c2f
>mtn: [right] 1fc2275efef8645a25e267ae47686e57e50ca1e1
>mtn: conflict: duplicate name 'abc' for the directory ''
>mtn: renamed from file 'bar' on the left
>mtn: renamed from file 'foo' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:453: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace 1fc2275efef8645a25e267ae47686e57e50ca1e1
>stdout:
>stderr:
>mtn: [left]  497d6e99c8b79ef5848aa862154f496432f07709
>mtn: [right] 1fc2275efef8645a25e267ae47686e57e50ca1e1
>mtn: conflict: duplicate name 'abc' for the directory ''
>mtn: renamed from file 'bar' on the left
>mtn: renamed from file 'foo' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:460: remove _MTN
>conflict_messages:460: remove foo
>conflict_messages:460: remove bar
>conflict_messages:460: remove baz
>conflict_messages:460: remove duplicate-add-rename
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:460: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch duplicate-add-rename
>stdout:
>stderr:
>exit code: 0
>conflict_messages:462: writefile foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:462: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:464: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch duplicate-add-rename
>stdout:
>stderr:
>mtn: beginning commit on branch 'duplicate-add-rename'
>mtn: committed revision d9ff68aa530d581731b0e5739b3494963cd89e91
>exit code: 0
>conflict_messages:465: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:467: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo bar
>stdout:
>stderr:
>mtn: renaming 'foo' to 'bar' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:468: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch duplicate-add-rename
>stdout:
>stderr:
>mtn: beginning commit on branch 'duplicate-add-rename'
>mtn: committed revision 446ea80c3f78fca1cfdb84aad55939f4e635ddc0
>exit code: 0
>conflict_messages:469: readfile _MTN/revision
>conflict_messages:471: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:471: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 446ea80c3f78fca1cfdb84aad55939f4e635ddc0
>stdout:
>format_version "1"
>dir ""
>   file "bar"
>content [c6864a8456855c48afe83488a47501fe8b94bd57]
>stderr:
>exit code: 0
>conflict_messages:471: rename stdout paths-new
>Destination paths-new exists; removing...
>conflict_messages:471: remove _MTN.old
>conflict_messages:471: rename _MTN _MTN.old
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:471: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of d9ff68aa530d581731b0e5739b3494963cd89e91
>stdout:
>format_version "1"
>dir ""
>   file "foo"
>content [c6864a8456855c48afe83488a47501fe8b94bd57]
>stderr:
>exit code: 0
>conflict_messages:471: rename stdout paths-old
>Destination paths-old exists; removing...
>conflict_messages:471: remove bar
>conflict_messages:471: remove foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:471: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net checkout --revision d9ff68aa530d581731b0e5739b3494963cd89e91 .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:471: readfile _MTN/revision
>conflict_messages:473: writefile bar
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:473: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add bar
>stdout:
>stderr:
>mtn: adding 'bar' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:477: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'duplicate-add-rename'
>mtn: selected update target 446ea80c3f78fca1cfdb84aad55939f4e635ddc0
>mtn: [left]  5a0caf796f02a000cdf5a24e57f45173ccb2b73e
>mtn: [right] 446ea80c3f78fca1cfdb84aad55939f4e635ddc0
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: added as a new file on the left
>mtn: renamed from file 'foo' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:480: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch duplicate-add-rename-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'duplicate-add-rename-propagate'
>mtn: committed revision 367cb265f641ead9834f497ff3cbcb2b85ffe1fa
>exit code: 0
>conflict_messages:481: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:483: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate duplicate-add-rename duplicate-add-rename-propagate
>stdout:
>stderr:
>mtn: propagating duplicate-add-rename -> duplicate-add-rename-propagate
>mtn: [left]  446ea80c3f78fca1cfdb84aad55939f4e635ddc0
>mtn: [right] 367cb265f641ead9834f497ff3cbcb2b85ffe1fa
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: renamed from file 'foo' on the left
>mtn: added as a new file on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:485: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert 367cb265f641ead9834f497ff3cbcb2b85ffe1fa branch duplicate-add-rename
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:487: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 446ea80c3f78fca1cfdb84aad55939f4e635ddc0 367cb265f641ead9834f497ff3cbcb2b85ffe1fa
>stdout:
>ancestor [d9ff68aa530d581731b0e5739b3494963cd89e91]
>stderr:
>mtn: [left]  446ea80c3f78fca1cfdb84aad55939f4e635ddc0
>mtn: [right] 367cb265f641ead9834f497ff3cbcb2b85ffe1fa
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: renamed from file 'foo' on the left
>mtn: added as a new file on the right
>mtn: 1 conflict with supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:490: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 446ea80c3f78fca1cfdb84aad55939f4e635ddc0 367cb265f641ead9834f497ff3cbcb2b85ffe1fa duplicate-add-rename
>stdout:
>stderr:
>mtn: [left]  446ea80c3f78fca1cfdb84aad55939f4e635ddc0
>mtn: [right] 367cb265f641ead9834f497ff3cbcb2b85ffe1fa
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: renamed from file 'foo' on the left
>mtn: added as a new file on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:493: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch duplicate-add-rename
>stdout:
>stderr:
>mtn: 2 heads on branch 'duplicate-add-rename'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  367cb265f641ead9834f497ff3cbcb2b85ffe1fa
>mtn: [right] 446ea80c3f78fca1cfdb84aad55939f4e635ddc0
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: added as a new file on the left
>mtn: renamed from file 'foo' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:496: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision d9ff68aa530d581731b0e5739b3494963cd89e91 --revision 446ea80c3f78fca1cfdb84aad55939f4e635ddc0
>stdout:
>stderr:
>mtn: [left]  da6f5d2395647ab46c8f08b74715a5f6d0be0836
>mtn: [right] 446ea80c3f78fca1cfdb84aad55939f4e635ddc0
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: added as a new file on the left
>mtn: renamed from file 'foo' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:499: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace 446ea80c3f78fca1cfdb84aad55939f4e635ddc0
>stdout:
>stderr:
>mtn: [left]  367cb265f641ead9834f497ff3cbcb2b85ffe1fa
>mtn: [right] 446ea80c3f78fca1cfdb84aad55939f4e635ddc0
>mtn: conflict: duplicate name 'bar' for the directory ''
>mtn: added as a new file on the left
>mtn: renamed from file 'foo' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:507: remove _MTN
>conflict_messages:507: remove foo
>conflict_messages:507: remove bar
>conflict_messages:507: remove baz
>conflict_messages:507: remove attribute-attached
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:507: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch attribute-attached
>stdout:
>stderr:
>exit code: 0
>conflict_messages:509: writefile foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:509: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:510: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net attr set foo attr1 value1
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:511: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net attr set foo attr2 value2
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:512: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch attribute-attached
>stdout:
>stderr:
>mtn: beginning commit on branch 'attribute-attached'
>mtn: committed revision c79cbcfb99f7a5e547815669b150dd3d9a28a598
>exit code: 0
>conflict_messages:513: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:515: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net attr set foo attr1 valueX
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:516: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net attr set foo attr2 valueY
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:517: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch attribute-attached
>stdout:
>stderr:
>mtn: beginning commit on branch 'attribute-attached'
>mtn: committed revision febd58929375e5820fb73dd258d3f53d77014aa9
>exit code: 0
>conflict_messages:518: readfile _MTN/revision
>conflict_messages:520: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:520: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of febd58929375e5820fb73dd258d3f53d77014aa9
>stdout:
>format_version "1"
>dir ""
>   file "foo"
>content [bab2022ff2ed13501a8a83bcc6bd53f5042141be]
>   attr "attr1" "valueX"
>   attr "attr2" "valueY"
>stderr:
>exit code: 0
>conflict_messages:520: rename stdout paths-new
>Destination paths-new exists; removing...
>conflict_messages:520: remove _MTN.old
>conflict_messages:520: rename _MTN _MTN.old
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:520: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of c79cbcfb99f7a5e547815669b150dd3d9a28a598
>stdout:
>format_version "1"
>dir ""
>   file "foo"
>content [bab2022ff2ed13501a8a83bcc6bd53f5042141be]
>   attr "attr1" "value1"
>   attr "attr2" "value2"
>stderr:
>exit code: 0
>conflict_messages:520: rename stdout paths-old
>Destination paths-old exists; removing...
>conflict_messages:520: remove foo
>conflict_messages:520: remove foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:520: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net checkout --revision c79cbcfb99f7a5e547815669b150dd3d9a28a598 .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:520: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:522: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net attr set foo attr1 valueZ
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:523: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net attr drop foo attr2
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:527: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'attribute-attached'
>mtn: selected update target febd58929375e5820fb73dd258d3f53d77014aa9
>mtn: [left]  e2cc7b6389a75a1535c1231325dec10043b548c1
>mtn: [right] febd58929375e5820fb73dd258d3f53d77014aa9
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo'
>mtn: set to 'valueZ' on the left
>mtn: set to 'valueX' on the right
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo'
>mtn: deleted on the left
>mtn: set to 'valueY' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:530: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch attribute-attached-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'attribute-attached-propagate'
>mtn: committed revision feec4de91f4698bc77f1b50c82ee4513cc47ae8f
>exit code: 0
>conflict_messages:531: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:533: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate attribute-attached attribute-attached-propagate
>stdout:
>stderr:
>mtn: propagating attribute-attached -> attribute-attached-propagate
>mtn: [left]  febd58929375e5820fb73dd258d3f53d77014aa9
>mtn: [right] feec4de91f4698bc77f1b50c82ee4513cc47ae8f
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo'
>mtn: set to 'valueX' on the left
>mtn: set to 'valueZ' on the right
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo'
>mtn: set to 'valueY' on the left
>mtn: deleted on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:535: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert feec4de91f4698bc77f1b50c82ee4513cc47ae8f branch attribute-attached
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:537: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts febd58929375e5820fb73dd258d3f53d77014aa9 feec4de91f4698bc77f1b50c82ee4513cc47ae8f
>stdout:
>ancestor [c79cbcfb99f7a5e547815669b150dd3d9a28a598]
>stderr:
>mtn: [left]  febd58929375e5820fb73dd258d3f53d77014aa9
>mtn: [right] feec4de91f4698bc77f1b50c82ee4513cc47ae8f
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo'
>mtn: set to 'valueX' on the left
>mtn: set to 'valueZ' on the right
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo'
>mtn: set to 'valueY' on the left
>mtn: deleted on the right
>mtn: 0 conflicts with supported resolutions.
>mtn: warning: 2 conflicts with no supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:540: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge febd58929375e5820fb73dd258d3f53d77014aa9 feec4de91f4698bc77f1b50c82ee4513cc47ae8f attribute-attached
>stdout:
>stderr:
>mtn: [left]  febd58929375e5820fb73dd258d3f53d77014aa9
>mtn: [right] feec4de91f4698bc77f1b50c82ee4513cc47ae8f
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo'
>mtn: set to 'valueX' on the left
>mtn: set to 'valueZ' on the right
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo'
>mtn: set to 'valueY' on the left
>mtn: deleted on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:543: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch attribute-attached
>stdout:
>stderr:
>mtn: 2 heads on branch 'attribute-attached'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  febd58929375e5820fb73dd258d3f53d77014aa9
>mtn: [right] feec4de91f4698bc77f1b50c82ee4513cc47ae8f
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo'
>mtn: set to 'valueX' on the left
>mtn: set to 'valueZ' on the right
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo'
>mtn: set to 'valueY' on the left
>mtn: deleted on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:546: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision c79cbcfb99f7a5e547815669b150dd3d9a28a598 --revision febd58929375e5820fb73dd258d3f53d77014aa9
>stdout:
>stderr:
>mtn: [left]  9ece69a54b5f21d5ec33a27864e6ca9764f48031
>mtn: [right] febd58929375e5820fb73dd258d3f53d77014aa9
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo'
>mtn: set to 'valueZ' on the left
>mtn: set to 'valueX' on the right
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo'
>mtn: deleted on the left
>mtn: set to 'valueY' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:549: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace febd58929375e5820fb73dd258d3f53d77014aa9
>stdout:
>stderr:
>mtn: [left]  feec4de91f4698bc77f1b50c82ee4513cc47ae8f
>mtn: [right] febd58929375e5820fb73dd258d3f53d77014aa9
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo'
>mtn: set to 'valueZ' on the left
>mtn: set to 'valueX' on the right
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo'
>mtn: deleted on the left
>mtn: set to 'valueY' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:557: remove _MTN
>conflict_messages:557: remove foo
>conflict_messages:557: remove bar
>conflict_messages:557: remove baz
>conflict_messages:557: remove attribute-detached
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:557: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch attribute-detached
>stdout:
>stderr:
>exit code: 0
>conflict_messages:559: writefile foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:559: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:560: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net attr set foo attr1 value1
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:561: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net attr set foo attr2 value2
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:562: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch attribute-detached
>stdout:
>stderr:
>mtn: beginning commit on branch 'attribute-detached'
>mtn: committed revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>exit code: 0
>conflict_messages:563: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:565: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net attr set foo attr1 valueX
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:566: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net attr set foo attr2 valueY
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:567: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo bar
>stdout:
>stderr:
>mtn: renaming 'foo' to 'bar' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:568: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch attribute-detached
>stdout:
>stderr:
>mtn: beginning commit on branch 'attribute-detached'
>mtn: committed revision 67ba83fd417fede6cb6de14d90783e93261e5210
>exit code: 0
>conflict_messages:569: readfile _MTN/revision
>conflict_messages:571: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:571: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 67ba83fd417fede6cb6de14d90783e93261e5210
>stdout:
>format_version "1"
>dir ""
>   file "bar"
>content [e80910e54d0bdea1b6d295ada320b87aaf9fdc23]
>   attr "attr1" "valueX"
>   attr "attr2" "valueY"
>stderr:
>exit code: 0
>conflict_messages:571: rename stdout paths-new
>Destination paths-new exists; removing...
>conflict_messages:571: remove _MTN.old
>conflict_messages:571: rename _MTN _MTN.old
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:571: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>stdout:
>format_version "1"
>dir ""
>   file "foo"
>content [e80910e54d0bdea1b6d295ada320b87aaf9fdc23]
>   attr "attr1" "value1"
>   attr "attr2" "value2"
>stderr:
>exit code: 0
>conflict_messages:571: rename stdout paths-old
>Destination paths-old exists; removing...
>conflict_messages:571: remove bar
>conflict_messages:571: remove foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:571: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net checkout --revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78 .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:571: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:573: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net attr set foo attr1 valueZ
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:574: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net attr drop foo attr2
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:575: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo baz
>stdout:
>stderr:
>mtn: renaming 'foo' to 'baz' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:579: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'attribute-detached'
>mtn: selected update target 67ba83fd417fede6cb6de14d90783e93261e5210
>mtn: [left]  a443a374b5ccde2b8a9a0d7e71cad8124ec49776
>mtn: [right] 67ba83fd417fede6cb6de14d90783e93261e5210
>mtn: conflict: multiple names for file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: renamed to 'baz' on the left
>mtn: renamed to 'bar' on the right
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: set to 'valueZ' on left file 'baz'
>mtn: set to 'valueX' on right file 'bar'
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: deleted from left file 'baz'
>mtn: set to 'valueY' on right file 'bar'
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:582: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch attribute-detached-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'attribute-detached-propagate'
>mtn: committed revision 2654ad872bf18d40260aaf59e8ce0058bf54bddd
>exit code: 0
>conflict_messages:583: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:585: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate attribute-detached attribute-detached-propagate
>stdout:
>stderr:
>mtn: propagating attribute-detached -> attribute-detached-propagate
>mtn: [left]  67ba83fd417fede6cb6de14d90783e93261e5210
>mtn: [right] 2654ad872bf18d40260aaf59e8ce0058bf54bddd
>mtn: conflict: multiple names for file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: renamed to 'bar' on the left
>mtn: renamed to 'baz' on the right
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: set to 'valueX' on left file 'bar'
>mtn: set to 'valueZ' on right file 'baz'
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: set to 'valueY' on left file 'bar'
>mtn: deleted from right file 'baz'
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:587: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert 2654ad872bf18d40260aaf59e8ce0058bf54bddd branch attribute-detached
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:589: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 67ba83fd417fede6cb6de14d90783e93261e5210 2654ad872bf18d40260aaf59e8ce0058bf54bddd
>stdout:
>ancestor [d81bb87785fa1bbe11aed1ca6d3340d288b61b78]
>stderr:
>mtn: [left]  67ba83fd417fede6cb6de14d90783e93261e5210
>mtn: [right] 2654ad872bf18d40260aaf59e8ce0058bf54bddd
>mtn: conflict: multiple names for file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: renamed to 'bar' on the left
>mtn: renamed to 'baz' on the right
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: set to 'valueX' on left file 'bar'
>mtn: set to 'valueZ' on right file 'baz'
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: set to 'valueY' on left file 'bar'
>mtn: deleted from right file 'baz'
>mtn: 0 conflicts with supported resolutions.
>mtn: warning: 3 conflicts with no supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:592: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 67ba83fd417fede6cb6de14d90783e93261e5210 2654ad872bf18d40260aaf59e8ce0058bf54bddd attribute-detached
>stdout:
>stderr:
>mtn: [left]  67ba83fd417fede6cb6de14d90783e93261e5210
>mtn: [right] 2654ad872bf18d40260aaf59e8ce0058bf54bddd
>mtn: conflict: multiple names for file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: renamed to 'bar' on the left
>mtn: renamed to 'baz' on the right
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: set to 'valueX' on left file 'bar'
>mtn: set to 'valueZ' on right file 'baz'
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: set to 'valueY' on left file 'bar'
>mtn: deleted from right file 'baz'
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:595: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch attribute-detached
>stdout:
>stderr:
>mtn: 2 heads on branch 'attribute-detached'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  2654ad872bf18d40260aaf59e8ce0058bf54bddd
>mtn: [right] 67ba83fd417fede6cb6de14d90783e93261e5210
>mtn: conflict: multiple names for file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: renamed to 'baz' on the left
>mtn: renamed to 'bar' on the right
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: set to 'valueZ' on left file 'baz'
>mtn: set to 'valueX' on right file 'bar'
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: deleted from left file 'baz'
>mtn: set to 'valueY' on right file 'bar'
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:598: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78 --revision 67ba83fd417fede6cb6de14d90783e93261e5210
>stdout:
>stderr:
>mtn: [left]  021027c56f3b2b7de32e9969214f133d15d01dd1
>mtn: [right] 67ba83fd417fede6cb6de14d90783e93261e5210
>mtn: conflict: multiple names for file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: renamed to 'baz' on the left
>mtn: renamed to 'bar' on the right
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: set to 'valueZ' on left file 'baz'
>mtn: set to 'valueX' on right file 'bar'
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: deleted from left file 'baz'
>mtn: set to 'valueY' on right file 'bar'
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:601: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace 67ba83fd417fede6cb6de14d90783e93261e5210
>stdout:
>stderr:
>mtn: [left]  2654ad872bf18d40260aaf59e8ce0058bf54bddd
>mtn: [right] 67ba83fd417fede6cb6de14d90783e93261e5210
>mtn: conflict: multiple names for file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: renamed to 'baz' on the left
>mtn: renamed to 'bar' on the right
>mtn: conflict: multiple values for attribute 'attr1' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: set to 'valueZ' on left file 'baz'
>mtn: set to 'valueX' on right file 'bar'
>mtn: conflict: multiple values for attribute 'attr2' on file 'foo' from revision d81bb87785fa1bbe11aed1ca6d3340d288b61b78
>mtn: deleted from left file 'baz'
>mtn: set to 'valueY' on right file 'bar'
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:609: remove _MTN
>conflict_messages:609: remove foo
>conflict_messages:609: remove bar
>conflict_messages:609: remove baz
>conflict_messages:609: remove content-attached
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:609: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch content-attached
>stdout:
>stderr:
>exit code: 0
>conflict_messages:611: writefile foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:611: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>exit code: 0
>conflict_messages:612: writefile bar
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:612: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add bar
>stdout:
>stderr:
>mtn: adding 'bar' to workspace manifest
>exit code: 0
>conflict_messages:613: writefile baz
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:613: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add baz
>stdout:
>stderr:
>mtn: adding 'baz' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:614: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch content-attached
>stdout:
>stderr:
>mtn: beginning commit on branch 'content-attached'
>mtn: committed revision 7d854bf031420b7a5c1cafcb908f1020593196a8
>exit code: 0
>conflict_messages:615: readfile _MTN/revision
>conflict_messages:617: writefile foo
>conflict_messages:618: writefile bar
>conflict_messages:619: writefile baz
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:620: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch content-attached
>stdout:
>stderr:
>mtn: beginning commit on branch 'content-attached'
>mtn: committed revision 0b9e5111f3e13ccb1727bc936aff962020dc9809
>exit code: 0
>conflict_messages:621: readfile _MTN/revision
>conflict_messages:623: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:623: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 0b9e5111f3e13ccb1727bc936aff962020dc9809
>stdout:
>format_version "1"
>dir ""
>   file "bar"
>content [08cd878106a93ce2ef036a32499c1432adb3ee0d]
>   file "baz"
>content [4ba6aabe8949871079bb70b5ae0cd64d502def46]
>   file "foo"
>content [e6b176b142ff08e09a1d8f836b5c65d9f650c0ef]
>stderr:
>exit code: 0
>conflict_messages:623: rename stdout paths-new
>Destination paths-new exists; removing...
>conflict_messages:623: remove _MTN.old
>conflict_messages:623: rename _MTN _MTN.old
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:623: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 7d854bf031420b7a5c1cafcb908f1020593196a8
>stdout:
>format_version "1"
>dir ""
>   file "bar"
>content [f0ef49fe92167fe2a086588019ffcff7ea561786]
>   file "baz"
>content [55320c8cee4b87edb47ec6d7e678af53eed2c717]
>   file "foo"
>content [26798f895189be8aa9a366011e3253c738966010]
>stderr:
>exit code: 0
>conflict_messages:623: rename stdout paths-old
>Destination paths-old exists; removing...
>conflict_messages:623: remove bar
>conflict_messages:623: remove baz
>conflict_messages:623: remove foo
>conflict_messages:623: remove bar
>conflict_messages:623: remove baz
>conflict_messages:623: remove foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:623: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net checkout --revision 7d854bf031420b7a5c1cafcb908f1020593196a8 .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:623: readfile _MTN/revision
>conflict_messages:625: writefile foo
>conflict_messages:626: writefile bar
>conflict_messages:627: writefile baz
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:631: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'content-attached'
>mtn: selected update target 0b9e5111f3e13ccb1727bc936aff962020dc9809
>mtn: [left]  e6fa3a3c34d0baa0f60744e9c4604df1b2b5a0c9
>mtn: [right] 0b9e5111f3e13ccb1727bc936aff962020dc9809
>mtn: 1 content conflict requires user intervention
>mtn: conflict: content conflict on file 'foo'
>mtn: content hash is 5d4daf4aff681dfcb97cca561ec06298489fafa3 on the left
>mtn: content hash is e6b176b142ff08e09a1d8f836b5c65d9f650c0ef on the right
>mtn: help required for 3-way merge
>mtn: [ancestor] foo
>mtn: [    left] foo
>mtn: [   right] foo
>mtn: [  merged] foo
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:636: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch content-attached-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'content-attached-propagate'
>mtn: committed revision 49d6a10f5f09b064a35f1700966795ae698f0555
>exit code: 0
>conflict_messages:637: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:639: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate content-attached content-attached-propagate
>stdout:
>stderr:
>mtn: propagating content-attached -> content-attached-propagate
>mtn: [left]  0b9e5111f3e13ccb1727bc936aff962020dc9809
>mtn: [right] 49d6a10f5f09b064a35f1700966795ae698f0555
>mtn: 1 content conflict requires user intervention
>mtn: conflict: content conflict on file 'foo'
>mtn: content hash is e6b176b142ff08e09a1d8f836b5c65d9f650c0ef on the left
>mtn: content hash is 5d4daf4aff681dfcb97cca561ec06298489fafa3 on the right
>mtn: help required for 3-way merge
>mtn: [ancestor] foo
>mtn: [    left] foo
>mtn: [   right] foo
>mtn: [  merged] foo
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:641: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert 49d6a10f5f09b064a35f1700966795ae698f0555 branch content-attached
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:643: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 0b9e5111f3e13ccb1727bc936aff962020dc9809 49d6a10f5f09b064a35f1700966795ae698f0555
>stdout:
>ancestor [7d854bf031420b7a5c1cafcb908f1020593196a8]
>stderr:
>mtn: [left]  0b9e5111f3e13ccb1727bc936aff962020dc9809
>mtn: [right] 49d6a10f5f09b064a35f1700966795ae698f0555
>mtn: conflict: content conflict on file 'bar'
>mtn: content hash is 08cd878106a93ce2ef036a32499c1432adb3ee0d on the left
>mtn: content hash is 0cf419dd93d38b2daaaf1f5e0f3ec647745b9690 on the right
>mtn: conflict: content conflict on file 'baz'
>mtn: content hash is 4ba6aabe8949871079bb70b5ae0cd64d502def46 on the left
>mtn: content hash is ac923b3bc65d6638cdee243bd46b57d3e14ce4ee on the right
>mtn: conflict: content conflict on file 'foo'
>mtn: content hash is e6b176b142ff08e09a1d8f836b5c65d9f650c0ef on the left
>mtn: content hash is 5d4daf4aff681dfcb97cca561ec06298489fafa3 on the right
>mtn: 3 conflicts with supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:646: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 0b9e5111f3e13ccb1727bc936aff962020dc9809 49d6a10f5f09b064a35f1700966795ae698f0555 content-attached
>stdout:
>stderr:
>mtn: [left]  0b9e5111f3e13ccb1727bc936aff962020dc9809
>mtn: [right] 49d6a10f5f09b064a35f1700966795ae698f0555
>mtn: 1 content conflict requires user intervention
>mtn: conflict: content conflict on file 'foo'
>mtn: content hash is e6b176b142ff08e09a1d8f836b5c65d9f650c0ef on the left
>mtn: content hash is 5d4daf4aff681dfcb97cca561ec06298489fafa3 on the right
>mtn: help required for 3-way merge
>mtn: [ancestor] foo
>mtn: [    left] foo
>mtn: [   right] foo
>mtn: [  merged] foo
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:649: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch content-attached
>stdout:
>stderr:
>mtn: 2 heads on branch 'content-attached'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  0b9e5111f3e13ccb1727bc936aff962020dc9809
>mtn: [right] 49d6a10f5f09b064a35f1700966795ae698f0555
>mtn: 1 content conflict requires user intervention
>mtn: conflict: content conflict on file 'foo'
>mtn: content hash is e6b176b142ff08e09a1d8f836b5c65d9f650c0ef on the left
>mtn: content hash is 5d4daf4aff681dfcb97cca561ec06298489fafa3 on the right
>mtn: help required for 3-way merge
>mtn: [ancestor] foo
>mtn: [    left] foo
>mtn: [   right] foo
>mtn: [  merged] foo
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:652: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision 7d854bf031420b7a5c1cafcb908f1020593196a8 --revision 0b9e5111f3e13ccb1727bc936aff962020dc9809
>stdout:
>stderr:
>mtn: [left]  d967e6302289241542a73b0ed2d73c116d5f13ee
>mtn: [right] 0b9e5111f3e13ccb1727bc936aff962020dc9809
>mtn: 1 content conflict requires user intervention
>mtn: conflict: content conflict on file 'foo'
>mtn: content hash is 5d4daf4aff681dfcb97cca561ec06298489fafa3 on the left
>mtn: content hash is e6b176b142ff08e09a1d8f836b5c65d9f650c0ef on the right
>mtn: help required for 3-way merge
>mtn: [ancestor] foo
>mtn: [    left] foo
>mtn: [   right] foo
>mtn: [  merged] foo
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:655: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace 0b9e5111f3e13ccb1727bc936aff962020dc9809
>stdout:
>stderr:
>mtn: [left]  49d6a10f5f09b064a35f1700966795ae698f0555
>mtn: [right] 0b9e5111f3e13ccb1727bc936aff962020dc9809
>mtn: 1 content conflict requires user intervention
>mtn: conflict: content conflict on file 'foo'
>mtn: content hash is 5d4daf4aff681dfcb97cca561ec06298489fafa3 on the left
>mtn: content hash is e6b176b142ff08e09a1d8f836b5c65d9f650c0ef on the right
>mtn: help required for 3-way merge
>mtn: [ancestor] foo
>mtn: [    left] foo
>mtn: [   right] foo
>mtn: [  merged] foo
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:662: remove _MTN
>conflict_messages:662: remove foo
>conflict_messages:662: remove bar
>conflict_messages:662: remove baz
>conflict_messages:662: remove content-detached
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:662: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch content-detached
>stdout:
>stderr:
>exit code: 0
>conflict_messages:664: writefile foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:664: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:665: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch content-detached
>stdout:
>stderr:
>mtn: beginning commit on branch 'content-detached'
>mtn: committed revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>exit code: 0
>conflict_messages:666: readfile _MTN/revision
>conflict_messages:668: writefile foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:669: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo bar
>stdout:
>stderr:
>mtn: renaming 'foo' to 'bar' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:671: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch content-detached
>stdout:
>stderr:
>mtn: beginning commit on branch 'content-detached'
>mtn: committed revision 7a4c8dae08866a0c65a5a136eeca82f85e028837
>exit code: 0
>conflict_messages:672: readfile _MTN/revision
>conflict_messages:674: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:674: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 7a4c8dae08866a0c65a5a136eeca82f85e028837
>stdout:
>format_version "1"
>dir ""
>   file "bar"
>content [f1bb6fff2ad16d67143d89fc374ede7abec5d437]
>stderr:
>exit code: 0
>conflict_messages:674: rename stdout paths-new
>Destination paths-new exists; removing...
>conflict_messages:674: remove _MTN.old
>conflict_messages:674: rename _MTN _MTN.old
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:674: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 936159c798b9bb3f5d0f871a0dda158a844e9348
>stdout:
>format_version "1"
>dir ""
>   file "foo"
>content [50bf338804db2685a575124c8c8371d06b65c523]
>stderr:
>exit code: 0
>conflict_messages:674: rename stdout paths-old
>Destination paths-old exists; removing...
>conflict_messages:674: remove bar
>conflict_messages:674: remove foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:674: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net checkout --revision 936159c798b9bb3f5d0f871a0dda158a844e9348 .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:674: readfile _MTN/revision
>conflict_messages:676: writefile foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:677: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo baz
>stdout:
>stderr:
>mtn: renaming 'foo' to 'baz' in workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:681: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'content-detached'
>mtn: selected update target 7a4c8dae08866a0c65a5a136eeca82f85e028837
>mtn: [left]  11d87704a3ecb9f3a0cf3a245dc97612a34f4dc4
>mtn: [right] 7a4c8dae08866a0c65a5a136eeca82f85e028837
>mtn: conflict: multiple names for file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: renamed to 'baz' on the left
>mtn: renamed to 'bar' on the right
>mtn: conflict: content conflict on file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: content hash is b966b2d35b99e456cb0c55e4573ef0b1b155b4a9 on the left in file 'baz'
>mtn: content hash is f1bb6fff2ad16d67143d89fc374ede7abec5d437 on the right in file 'bar'
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:684: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch content-detached-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'content-detached-propagate'
>mtn: committed revision 40a6208fa7406a393823d33aecae509c80db37b4
>exit code: 0
>conflict_messages:685: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:687: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate content-detached content-detached-propagate
>stdout:
>stderr:
>mtn: propagating content-detached -> content-detached-propagate
>mtn: [left]  7a4c8dae08866a0c65a5a136eeca82f85e028837
>mtn: [right] 40a6208fa7406a393823d33aecae509c80db37b4
>mtn: conflict: multiple names for file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: renamed to 'bar' on the left
>mtn: renamed to 'baz' on the right
>mtn: conflict: content conflict on file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: content hash is f1bb6fff2ad16d67143d89fc374ede7abec5d437 on the left in file 'bar'
>mtn: content hash is b966b2d35b99e456cb0c55e4573ef0b1b155b4a9 on the right in file 'baz'
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:689: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert 40a6208fa7406a393823d33aecae509c80db37b4 branch content-detached
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:691: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 7a4c8dae08866a0c65a5a136eeca82f85e028837 40a6208fa7406a393823d33aecae509c80db37b4
>stdout:
>ancestor [936159c798b9bb3f5d0f871a0dda158a844e9348]
>stderr:
>mtn: [left]  7a4c8dae08866a0c65a5a136eeca82f85e028837
>mtn: [right] 40a6208fa7406a393823d33aecae509c80db37b4
>mtn: conflict: multiple names for file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: renamed to 'bar' on the left
>mtn: renamed to 'baz' on the right
>mtn: conflict: content conflict on file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: content hash is f1bb6fff2ad16d67143d89fc374ede7abec5d437 on the left in file 'bar'
>mtn: content hash is b966b2d35b99e456cb0c55e4573ef0b1b155b4a9 on the right in file 'baz'
>mtn: 1 conflict with supported resolutions.
>mtn: warning: 1 conflict with no supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:694: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 7a4c8dae08866a0c65a5a136eeca82f85e028837 40a6208fa7406a393823d33aecae509c80db37b4 content-detached
>stdout:
>stderr:
>mtn: [left]  7a4c8dae08866a0c65a5a136eeca82f85e028837
>mtn: [right] 40a6208fa7406a393823d33aecae509c80db37b4
>mtn: conflict: multiple names for file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: renamed to 'bar' on the left
>mtn: renamed to 'baz' on the right
>mtn: conflict: content conflict on file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: content hash is f1bb6fff2ad16d67143d89fc374ede7abec5d437 on the left in file 'bar'
>mtn: content hash is b966b2d35b99e456cb0c55e4573ef0b1b155b4a9 on the right in file 'baz'
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:697: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge --branch content-detached
>stdout:
>stderr:
>mtn: 2 heads on branch 'content-detached'
>mtn: merge 1 / 1:
>mtn: calculating best pair of heads to merge next
>mtn: [left]  40a6208fa7406a393823d33aecae509c80db37b4
>mtn: [right] 7a4c8dae08866a0c65a5a136eeca82f85e028837
>mtn: conflict: multiple names for file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: renamed to 'baz' on the left
>mtn: renamed to 'bar' on the right
>mtn: conflict: content conflict on file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: content hash is b966b2d35b99e456cb0c55e4573ef0b1b155b4a9 on the left in file 'baz'
>mtn: content hash is f1bb6fff2ad16d67143d89fc374ede7abec5d437 on the right in file 'bar'
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:700: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net pluck --revision 936159c798b9bb3f5d0f871a0dda158a844e9348 --revision 7a4c8dae08866a0c65a5a136eeca82f85e028837
>stdout:
>stderr:
>mtn: [left]  9bb0de65e23fb804e8a76031606cb03173c18429
>mtn: [right] 7a4c8dae08866a0c65a5a136eeca82f85e028837
>mtn: conflict: multiple names for file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: renamed to 'baz' on the left
>mtn: renamed to 'bar' on the right
>mtn: conflict: content conflict on file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: content hash is b966b2d35b99e456cb0c55e4573ef0b1b155b4a9 on the left in file 'baz'
>mtn: content hash is f1bb6fff2ad16d67143d89fc374ede7abec5d437 on the right in file 'bar'
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:703: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net merge_into_workspace 7a4c8dae08866a0c65a5a136eeca82f85e028837
>stdout:
>stderr:
>mtn: [left]  40a6208fa7406a393823d33aecae509c80db37b4
>mtn: [right] 7a4c8dae08866a0c65a5a136eeca82f85e028837
>mtn: conflict: multiple names for file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: renamed to 'baz' on the left
>mtn: renamed to 'bar' on the right
>mtn: conflict: content conflict on file 'foo' from revision 936159c798b9bb3f5d0f871a0dda158a844e9348
>mtn: content hash is b966b2d35b99e456cb0c55e4573ef0b1b155b4a9 on the left in file 'baz'
>mtn: content hash is f1bb6fff2ad16d67143d89fc374ede7abec5d437 on the right in file 'bar'
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>conflict_messages:715: remove _MTN
>conflict_messages:715: remove foo
>conflict_messages:715: remove bar
>conflict_messages:715: remove baz
>conflict_messages:715: remove multiple-name-plus-duplicate-name
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:715: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net setup . --branch multiple-name-plus-duplicate-name
>stdout:
>stderr:
>exit code: 0
>conflict_messages:717: writefile foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:717: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add foo
>stdout:
>stderr:
>mtn: adding 'foo' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:718: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch multiple-name-plus-duplicate-name
>stdout:
>stderr:
>mtn: beginning commit on branch 'multiple-name-plus-duplicate-name'
>mtn: committed revision 621e8ed86b46adcc57cd6abec90ecc41481a3e3b
>exit code: 0
>conflict_messages:719: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:721: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo aaa
>stdout:
>stderr:
>mtn: renaming 'foo' to 'aaa' in workspace manifest
>exit code: 0
>conflict_messages:722: writefile bbb
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:722: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add bbb
>stdout:
>stderr:
>mtn: adding 'bbb' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:724: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch multiple-name-plus-duplicate-name
>stdout:
>stderr:
>mtn: beginning commit on branch 'multiple-name-plus-duplicate-name'
>mtn: committed revision 424a7237e21522fd09878f486acbb8807cae59e6
>exit code: 0
>conflict_messages:725: readfile _MTN/revision
>conflict_messages:727: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:727: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 424a7237e21522fd09878f486acbb8807cae59e6
>stdout:
>format_version "1"
>dir ""
>   file "aaa"
>content [eaf183d079563812d0c6860225ea9e4e0e2ebc20]
>   file "bbb"
>content [ab13fbf2a2faccb74eb30e2c76ba680c901a124a]
>stderr:
>exit code: 0
>conflict_messages:727: rename stdout paths-new
>Destination paths-new exists; removing...
>conflict_messages:727: remove _MTN.old
>conflict_messages:727: rename _MTN _MTN.old
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:727: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net automate get_manifest_of 621e8ed86b46adcc57cd6abec90ecc41481a3e3b
>stdout:
>format_version "1"
>dir ""
>   file "foo"
>content [eaf183d079563812d0c6860225ea9e4e0e2ebc20]
>stderr:
>exit code: 0
>conflict_messages:727: rename stdout paths-old
>Destination paths-old exists; removing...
>conflict_messages:727: remove aaa
>conflict_messages:727: remove bbb
>conflict_messages:727: remove foo
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:727: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net checkout --revision 621e8ed86b46adcc57cd6abec90ecc41481a3e3b .
>stdout:
>stderr:
>exit code: 0
>conflict_messages:727: readfile _MTN/revision
>conflict_messages:728: remove aaa
>conflict_messages:729: remove bbb
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:731: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net mv foo bbb
>stdout:
>stderr:
>mtn: renaming 'foo' to 'bbb' in workspace manifest
>exit code: 0
>conflict_messages:732: writefile aaa
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:732: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net add aaa
>stdout:
>stderr:
>mtn: adding 'aaa' to workspace manifest
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:740: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net update
>stdout:
>stderr:
>mtn: updating along branch 'multiple-name-plus-duplicate-name'
>mtn: selected update target 424a7237e21522fd09878f486acbb8807cae59e6
>mtn: [left]  0d2903f9f8a558780e949aa9f8866ad443a14acf
>mtn: [right] 424a7237e21522fd09878f486acbb8807cae59e6
>mtn: conflict: multiple names for file 'foo' from revision 621e8ed86b46adcc57cd6abec90ecc41481a3e3b
>mtn: renamed to 'bbb' on the left
>mtn: renamed to 'aaa' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:744: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net commit --message blah-blah --branch multiple-name-plus-duplicate-name-propagate
>stdout:
>stderr:
>mtn: beginning commit on branch 'multiple-name-plus-duplicate-name-propagate'
>mtn: committed revision ef9b007adf6e49cc6b7e5317d860fb5716f418e9
>exit code: 0
>conflict_messages:745: readfile _MTN/revision
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:747: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net propagate multiple-name-plus-duplicate-name multiple-name-plus-duplicate-name-propagate
>stdout:
>stderr:
>mtn: propagating multiple-name-plus-duplicate-name -> multiple-name-plus-duplicate-name-propagate
>mtn: [left]  424a7237e21522fd09878f486acbb8807cae59e6
>mtn: [right] ef9b007adf6e49cc6b7e5317d860fb5716f418e9
>mtn: conflict: multiple names for file 'foo' from revision 621e8ed86b46adcc57cd6abec90ecc41481a3e3b
>mtn: renamed to 'aaa' on the left
>mtn: renamed to 'bbb' on the right
>mtn: misuse: merge failed due to unresolved conflicts
>exit code: 1
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:750: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net cert ef9b007adf6e49cc6b7e5317d860fb5716f418e9 branch multiple-name-plus-duplicate-name
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:752: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net show_conflicts 424a7237e21522fd09878f486acbb8807cae59e6 ef9b007adf6e49cc6b7e5317d860fb5716f418e9
>stdout:
>ancestor [621e8ed86b46adcc57cd6abec90ecc41481a3e3b]
>stderr:
>mtn: [left]  424a7237e21522fd09878f486acbb8807cae59e6
>mtn: [right] ef9b007adf6e49cc6b7e5317d860fb5716f418e9
>mtn: conflict: multiple names for file 'foo' from revision 621e8ed86b46adcc57cd6abec90ecc41481a3e3b
>mtn: renamed to 'aaa' on the left
>mtn: renamed to 'bbb' on the right
>mtn: 0 conflicts with supported resolutions.
>mtn: warning: 1 conflict with no supported resolutions.
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>conflict_messages:756: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/conflict_messages/keys --key=tester@test.net explicit_merge 424a7237e21522fd09878f486acbb8807cae59e6 ef9b007adf6e49cc6b7e5317d860fb5716f418e9 multiple-name-plus-duplicate-name
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 1 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func/conflict_messages/__driver__.lua:756: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test pluck_restricted
>pluck_restricted:1: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>pluck_restricted:1: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>pluck_restricted:1: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>pluck_restricted:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/pluck_restricted --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/pluck_restricted --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/pluck_restricted/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/pluck_restricted/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/pluck_restricted/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>pluck_restricted:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/pluck_restricted --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/pluck_restricted --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/pluck_restricted/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/pluck_restricted/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/pluck_restricted/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:130: in function 'mtn_setup'
>	/builddir/build/BUILD/monotone-1.0/test/func/pluck_restricted/__driver__.lua:1: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test propagate_a_descendent
>propagate_a_descendent:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>propagate_a_descendent:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>propagate_a_descendent:2: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>propagate_a_descendent:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/propagate_a_descendent --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/propagate_a_descendent --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/propagate_a_descendent/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/propagate_a_descendent/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/propagate_a_descendent/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>propagate_a_descendent:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/propagate_a_descendent --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/propagate_a_descendent --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/propagate_a_descendent/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/propagate_a_descendent/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/propagate_a_descendent/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:130: in function 'mtn_setup'
>	/builddir/build/BUILD/monotone-1.0/test/func/propagate_a_descendent/__driver__.lua:2: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test status_with_no_key
>status_with_no_key:1: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>status_with_no_key:1: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>status_with_no_key:1: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>status_with_no_key:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>status_with_no_key:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>mtn: read 1 packet
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>status_with_no_key:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key/keys --key=tester@test.net setup --branch=testbranch .
>stdout:
>stderr:
>exit code: 0
>status_with_no_key:1: remove test_keys
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>status_with_no_key:4: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/status_with_no_key/keys --key=tester@test.net status
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func/status_with_no_key/__driver__.lua:4: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test two_parent_workspace_pivot_root
>two_parent_workspace_pivot_root:1: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>two_parent_workspace_pivot_root:1: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>two_parent_workspace_pivot_root:1: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>two_parent_workspace_pivot_root:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/two_parent_workspace_pivot_root --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/two_parent_workspace_pivot_root --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/two_parent_workspace_pivot_root/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/two_parent_workspace_pivot_root/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/two_parent_workspace_pivot_root/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>two_parent_workspace_pivot_root:1: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/two_parent_workspace_pivot_root --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/two_parent_workspace_pivot_root --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/two_parent_workspace_pivot_root/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/two_parent_workspace_pivot_root/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/two_parent_workspace_pivot_root/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:130: in function 'mtn_setup'
>	/builddir/build/BUILD/monotone-1.0/test/func/two_parent_workspace_pivot_root/__driver__.lua:1: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test update_does_not_suggest_suspended_branches
>update_does_not_suggest_suspended_branches:3: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>update_does_not_suggest_suspended_branches:3: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>update_does_not_suggest_suspended_branches:3: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>update_does_not_suggest_suspended_branches:3: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/update_does_not_suggest_suspended_branches --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/update_does_not_suggest_suspended_branches --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/update_does_not_suggest_suspended_branches/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/update_does_not_suggest_suspended_branches/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/update_does_not_suggest_suspended_branches/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>update_does_not_suggest_suspended_branches:3: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/update_does_not_suggest_suspended_branches --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/update_does_not_suggest_suspended_branches --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/update_does_not_suggest_suspended_branches/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/update_does_not_suggest_suspended_branches/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/update_does_not_suggest_suspended_branches/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:130: in function 'mtn_setup'
>	/builddir/build/BUILD/monotone-1.0/test/func/update_does_not_suggest_suspended_branches/__driver__.lua:3: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>**************************************************
>Test validate_commit_message_hook
>validate_commit_message_hook:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_keys -> test_keys
>validate_commit_message_hook:2: copy /builddir/build/BUILD/monotone-1.0/test/func/test_hooks.lua -> test_hooks.lua
>validate_commit_message_hook:2: copy /builddir/build/BUILD/monotone-1.0/test/func/min_hooks.lua -> min_hooks.lua
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>validate_commit_message_hook:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/validate_commit_message_hook --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/validate_commit_message_hook --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/validate_commit_message_hook/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/validate_commit_message_hook/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/validate_commit_message_hook/keys --key=tester@test.net db init
>stdout:
>stderr:
>exit code: 0
>stdin:
>runcmd: /builddir/build/BUILD/monotone-1.0/mtn, local_redir = false, requested = nil
>validate_commit_message_hook:2: /builddir/build/BUILD/monotone-1.0/mtn --no-standard-rcfiles --root=/builddir/build/BUILD/monotone-1.0/test/work/func/validate_commit_message_hook --confdir=/builddir/build/BUILD/monotone-1.0/test/work/func/validate_commit_message_hook --rcfile /builddir/build/BUILD/monotone-1.0/test/work/func/validate_commit_message_hook/test_hooks.lua --db=/builddir/build/BUILD/monotone-1.0/test/work/func/validate_commit_message_hook/test.db --keydir /builddir/build/BUILD/monotone-1.0/test/work/func/validate_commit_message_hook/keys --key=tester@test.net read test_keys
>stdout:
>stderr:
>/builddir/build/BUILD/monotone-1.0/mtn: fatal signal: Segmentation fault
>this is almost certainly a bug in monotone.
>please send this error message, the output of '/builddir/build/BUILD/monotone-1.0/mtn version --full',
>and a description of what you were doing to <https://code.monotone.ca/p/monotone/issues/>
>do not send a core dump, but if you have one, 
>please preserve it in case we ask you for information from it.
>exit code: -11
>Check failed (return value): wanted 0 got -11
>stack traceback:
>	[string "testlib.lua"]:114: in function 'err'
>	[string "testlib.lua"]:643: in function 'post_cmd'
>	[string "testlib.lua"]:774: in function <[string "testlib.lua"]:767>
>	(...tail calls...)
>	/builddir/build/BUILD/monotone-1.0/test/func-testsuite.lua:130: in function 'mtn_setup'
>	/builddir/build/BUILD/monotone-1.0/test/func/validate_commit_message_hook/__driver__.lua:2: in main chunk
>	[C]: in function 'xpcall'
>	[string "testlib.lua"]:1142: in function <[string "testlib.lua"]:1110>
>	[C]: in function 'run_tests_in_children'
>	[string "testlib.lua"]:1071: in function <[string "testlib.lua"]:866>
>Of 604 tests run:
>	493 succeeded
>	15 failed
>	37 had expected failures
>	0 succeeded unexpectedly
>	59 were skipped
>==> test/work/tester.log <==
>Running on Linux 3.14.4-200.fc20.x86_64 #1 SMP Tue May 13 13:51:08 UTC 2014 x86_64
>Running tests...
>  1 cleanup-1                                     ok 0:00, 0:00 on CPU
>  2 cleanup-2                                     ok 0:00, 0:00 on CPU
>  3 isolated-1                                    ok 0:00, 0:00 on CPU
>  4 isolated-2                                    ok 0:00, 0:00 on CPU
>  5 remove-unwriteable                            ok 0:00, 0:00 on CPU
>  6 running_commands                              ok 0:00, 0:00 on CPU
>Of 6 tests run:
>	6 succeeded
>	0 failed
>	0 had expected failures
>	0 succeeded unexpectedly
>	0 were skipped
>==> test/work/tests.log <==
>test/bin/unit_tester found at /builddir/build/BUILD/monotone-1.0/test/bin/unit_tester
>Running on Linux 3.14.4-200.fc20.x86_64 #1 SMP Tue May 13 13:51:08 UTC 2014 x86_64
>mtn found at /builddir/build/BUILD/monotone-1.0/mtn
>monotone 1.0 (base revision: a7c3a1d9de1ba7a62c9dd9efee17252234bb502c)
>Running on          : Linux 3.14.4-200.fc20.x86_64 #1 SMP Tue May 13 13:51:08 UTC 2014 x86_64
>C++ compiler        : GNU C++ version 4.9.0 20140604 (Red Hat 4.9.0-8)
>C++ standard library: GNU libstdc++ version 20140604
>Boost version       : 1_55
>SQLite version      : 3.8.4.3 (compiled against 3.8.4.3)
>Lua version         : Lua 5.2
>PCRE version        : 8.35 2014-04-04 (compiled against 8.35)
>Botan version       : 1.10.8 (compiled against 1.10.8)
>Changes since base revision:
>format_version "1"
>new_manifest [b252820fde344fd3f5d023fd91de86522baa671d]
>old_revision [a7c3a1d9de1ba7a62c9dd9efee17252234bb502c]
>  Generated from data cached in the distribution;
>  further changes may have been made.
>Running tests...
>  1 _unit_tester_fail_check                       ok 0:00, 0:00 on CPU
>  5 _unit_tester_uncaught                         ok 0:00, 0:00 on CPU
>  2 _unit_tester_fail_nothrow                     ok 0:00, 0:00 on CPU
>  3 _unit_tester_fail_require                     ok 0:00, 0:00 on CPU
>  4 _unit_tester_fail_throw                       ok 0:00, 0:00 on CPU
>  7 _unit_tester_uncaught_std_what                ok 0:00, 0:00 on CPU
>  6 _unit_tester_uncaught_std                     ok 0:00, 0:00 on CPU
>  8 basic_io_binary_transparency                  ok 0:00, 0:00 on CPU
>  9 charset_idna_encoding                         ok 0:01, 0:00 on CPU
> 10 charset_utf8_validation                       ok 0:00, 0:00 on CPU
> 11 commands_command_complete_command             ok 0:00, 0:00 on CPU
> 12 commands_command_find_command                 ok 0:00, 0:00 on CPU
> 13 commands_complete_command                     ok 0:00, 0:00 on CPU
> 14 commands_make_command_id                      ok 0:00, 0:00 on CPU
> 15 cset_basic_csets                              ok 0:00, 0:00 on CPU
> 16 cset_cset_written                             ok 0:00, 0:00 on CPU
> 17 cset_invalid_csets                            ok 0:00, 0:00 on CPU
> 18 cset_root_dir                                 ok 0:00, 0:00 on CPU
> 19 dates_comparisons                             ok 0:00, 0:00 on CPU
> 20 dates_from_string                             ok 0:00, 0:00 on CPU
> 21 dates_from_unix_epoch                         ok 0:00, 0:00 on CPU
> 22 dates_localtime_formats                       ok 0:05, 0:04 on CPU
> 23 dates_our_timegm                              ok 0:00, 0:00 on CPU
> 25 git_change_reorder_chained_renames            ok 0:00, 0:00 on CPU
> 26 git_change_reorder_rename_loop                ok 0:00, 0:00 on CPU
> 27 git_change_reorder_reversed_rename_loop       ok 0:00, 0:00 on CPU
> 28 git_change_reorder_swapped_renames            ok 0:00, 0:00 on CPU
> 29 globish_complex_matches                       ok 0:00, 0:00 on CPU
> 30 globish_from_vector                           ok 0:00, 0:00 on CPU
> 31 globish_nested_matches                        ok 0:00, 0:00 on CPU
> 32 globish_simple_matches                        ok 0:00, 0:00 on CPU
> 33 globish_syntax                                ok 0:00, 0:00 on CPU
> 34 graph_get_uncommon_ancestors_nasty_convexity_case ok 0:00, 0:00 on CPU
> 38 key_packet_validators                         ok 0:00, 0:00 on CPU
> 37 key_packet_roundabout                         ok 0:00, 0:00 on CPU
> 40 merge_3way_merge_append                       ok 0:00, 0:00 on CPU
> 39 merge_3way_merge_additions                    ok 0:00, 0:00 on CPU
> 41 merge_3way_merge_deletions                    ok 0:00, 0:00 on CPU
> 42 merge_3way_merge_prepend                      ok 0:00, 0:00 on CPU
> 44 merge_roster_attr_lifecycle                   ok 0:00, 0:00 on CPU
> 45 merge_roster_complex_structural_conflicts     ok 0:00, 0:00 on CPU
> 46 merge_roster_node_lifecycle                   ok 0:00, 0:00 on CPU
> 43 merge_3way_randomizing_merge                  ok 0:00, 0:00 on CPU
> 47 merge_roster_scalar_merges                    ok 0:00, 0:00 on CPU
> 48 merge_roster_simple_structural_conflicts      ok 0:00, 0:00 on CPU
> 50 netcmd_functions                              ok 0:00, 0:00 on CPU
> 51 netcmd_mac                                    ok 0:00, 0:00 on CPU
> 49 mkstemp_basic                                 ok 0:00, 0:00 on CPU
> 52 netxx_pipe_simple_pipe                        ok 0:00, 0:00 on CPU
> 53 numeric_vocab_widen                           ok 0:00, 0:00 on CPU
> 54 option_concrete_options                       ok 0:00, 0:00 on CPU
> 55 outdated_indicator_basic                      ok 0:00, 0:00 on CPU
> 56 packet_roundabout                             ok 0:00, 0:00 on CPU
> 24 dates_roundtrip_localtimes                    ok 0:07, 0:06 on CPU
> 58 paths_access_tracker                          ok 0:00, 0:00 on CPU
> 57 packet_validators                             ok 0:00, 0:00 on CPU
> 61 paths_depth                                   ok 0:00, 0:00 on CPU
> 59 paths_basename                                ok 0:00, 0:00 on CPU
> 60 paths_bookkeeping                             ok 0:00, 0:00 on CPU
> 64 paths_file_path_external_prefix__MTN          ok 0:00, 0:00 on CPU
> 62 paths_dirname                                 ok 0:00, 0:00 on CPU
> 65 paths_file_path_external_prefix_a_b           ok 0:00, 0:00 on CPU
> 63 paths_file_path_external_null_prefix          ok 0:00, 0:00 on CPU
> 67 paths_find_old_new_path_for                   ok 0:00, 0:00 on CPU
> 68 paths_ordering                                ok 0:00, 0:00 on CPU
> 66 paths_file_path_internal                      ok 0:00, 0:00 on CPU
> 71 paths_system                                  ok 0:00, 0:00 on CPU
> 69 paths_ordering_random                         ok 0:00, 0:00 on CPU
> 72 paths_test_external_string_is_bookkeeping_path_prefix__MTN ok 0:00, 0:00 on CPU
> 70 paths_path_component                          ok 0:00, 0:00 on CPU
> 73 paths_test_external_string_is_bookkeeping_path_prefix_a_b ok 0:00, 0:00 on CPU
> 74 paths_test_external_string_is_bookkeeping_path_prefix_none ok 0:00, 0:00 on CPU
> 75 paths_test_internal_string_is_bookkeeping_path ok 0:00, 0:00 on CPU
> 36 graph_random_get_reconstruction_path          ok 0:01, 0:00 on CPU
> 76 pcrewrap_extract_captures                     ok 0:00, 0:00 on CPU
> 77 pcrewrap_simple_match                         ok 0:00, 0:00 on CPU
> 78 refiner_count_0_1                             ok 0:00, 0:00 on CPU
> 35 graph_get_uncommon_ancestors_randomly         ok 0:07, 0:05 on CPU
> 81 restrictions_empty_restriction                ok 0:00, 0:00 on CPU
> 82 restrictions_exclude_include                  ok 0:00, 0:00 on CPU
> 83 restrictions_ignored_invalid_workspace_paths  ok 0:00, 0:00 on CPU
> 84 restrictions_include_depth_0                  ok 0:00, 0:00 on CPU
> 85 restrictions_include_depth_1                  ok 0:00, 0:00 on CPU
> 86 restrictions_include_depth_1_empty_restriction ok 0:00, 0:00 on CPU
> 88 restrictions_include_exclude                  ok 0:00, 0:00 on CPU
> 87 restrictions_include_depth_2                  ok 0:00, 0:00 on CPU
> 90 restrictions_invalid_workspace_paths          ok 0:00, 0:00 on CPU
> 89 restrictions_invalid_roster_paths             ok 0:00, 0:00 on CPU
> 91 restrictions_simple_exclude                   ok 0:00, 0:00 on CPU
> 92 restrictions_simple_include                   ok 0:00, 0:00 on CPU
> 94 rev_height_comparisons                        ok 0:00, 0:00 on CPU
> 95 rev_height_count_up                           ok 0:00, 0:00 on CPU
> 93 rev_height_children                           ok 0:00, 0:00 on CPU
> 96 revision_from_network                         ok 0:00, 0:00 on CPU
> 97 roster_all_0_scalar_parent_mark_scenarios     ok 0:01, 0:00 on CPU
> 98 roster_all_1_scalar_parent_mark_scenarios     ok 0:00, 0:00 on CPU
> 99 roster_all_2_scalar_parent_mark_scenarios     ok 0:00, 0:00 on CPU
> 80 refiner_count_128                             ok 0:05, 0:04 on CPU
>100 roster_bad_attr                               ok 0:00, 0:00 on CPU
>101 roster_check_sane_against                     ok 0:01, 0:00 on CPU
>102 roster_check_sane_roster                      ok 0:00, 0:00 on CPU
>103 roster_check_sane_roster_loop                 ok 0:00, 0:00 on CPU
>104 roster_check_sane_roster_screwy_dir_map       ok 0:00, 0:00 on CPU
>105 roster_die_die_die_merge                      ok 0:00, 0:00 on CPU
>107 roster_residual_attr_mark_scenario            ok 0:00, 0:00 on CPU
>109 roster_unify_rosters_end_to_end_attr_corpses  ok 0:00, 0:00 on CPU
>108 roster_same_nid_diff_type                     ok 0:00, 0:00 on CPU
>110 roster_unify_rosters_end_to_end_ids           ok 0:00, 0:00 on CPU
>111 roster_unify_rosters_randomized_tempids       ok 0:01, 0:00 on CPU
>112 roster_unify_rosters_randomized_trueids       ok 0:00, 0:00 on CPU
>113 roster_write_roster                           ok 0:00, 0:00 on CPU
>114 sha1_long_message                             ok 0:00, 0:00 on CPU
>116 sha1_short_message                            ok 0:00, 0:00 on CPU
>117 simplestring_xform_caseconv                   ok 0:00, 0:00 on CPU
>118 simplestring_xform_join_lines                 ok 0:00, 0:00 on CPU
>115 sha1_pseudo_message                           ok 0:00, 0:00 on CPU
>119 simplestring_xform_join_words                 ok 0:00, 0:00 on CPU
>120 simplestring_xform_split_into_words           ok 0:00, 0:00 on CPU
>121 simplestring_xform_trimming                   ok 0:00, 0:00 on CPU
>122 string_queue_basic                            ok 0:00, 0:00 on CPU
>123 transforms_calculate_ident                    ok 0:00, 0:00 on CPU
>124 transforms_corruption_check                   ok 0:00, 0:00 on CPU
>125 transforms_enc                                ok 0:00, 0:00 on CPU
>126 uri_basic                                     ok 0:00, 0:00 on CPU
>127 uri_bizarre                                   ok 0:00, 0:00 on CPU
>128 uri_invalid                                   ok 0:00, 0:00 on CPU
>129 uri_urldecode                                 ok 0:00, 0:00 on CPU
>130 vocab_verify_hexenc_id                        ok 0:00, 0:00 on CPU
> 79 refiner_count_1024                            ok 0:46, 0:36 on CPU
>106 roster_random_actions                         ok 0:42, 0:41 on CPU
>Of 130 tests run:
>	130 succeeded
>	0 failed
>	0 had expected failures
>	0 succeeded unexpectedly
>	0 were skipped
>RPM build errors:
>+ false
>error: Bad exit status from /var/tmp/rpm-tmp.qhouIJ (%check)
>    Bad exit status from /var/tmp/rpm-tmp.qhouIJ (%check)
>Child return code was: 1
>EXCEPTION: Command failed. See logs for output.
> # ['bash', '--login', '-c', 'rpmbuild -bb --target x86_64 --nodeps  builddir/build/SPECS/monotone.spec']
>Traceback (most recent call last):
>  File "/usr/lib/python2.7/site-packages/mockbuild/trace_decorator.py", line 70, in trace
>    result = func(*args, **kw)
>  File "/usr/lib/python2.7/site-packages/mockbuild/util.py", line 376, in do
>    raise mockbuild.exception.Error, ("Command failed. See logs for output.\n # %s" % (command,), child.returncode)
>Error: Command failed. See logs for output.
> # ['bash', '--login', '-c', 'rpmbuild -bb --target x86_64 --nodeps  builddir/build/SPECS/monotone.spec']
>LEAVE do --> EXCEPTION RAISED
>

Actions: View

Attachments on bug 1106236: 904267 | 904268 | 904269