# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1533324923 25200
# Node ID c83ad57627ae14e4314093b1d26fdfc996f14041
# Parent  ca4de8ba5b5f4c73eb48f4c35a2dc91848ea8c31# Parent  c9e6ca31cfe7bed4903fa129b7d2598487d97c67
merge with stable

diff -r ca4de8ba5b5f -r c83ad57627ae contrib/packaging/dockerdeb
--- a/contrib/packaging/dockerdeb	Sat Jul 21 16:49:01 2018 +0900
+++ b/contrib/packaging/dockerdeb	Fri Aug 03 12:35:23 2018 -0700
@@ -33,7 +33,7 @@
 fi
 $DOCKER run -u $DBUILDUSER --rm -v $ROOTDIR/..:/mnt $CONTAINER \
   sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/packaging/builddeb --build --distid $DISTID --codename $CODENAME $@"
-contrib/packaging/builddeb --cleanup --distid $DISTID --codename $CODENAME
+(cd $ROOTDIR && contrib/packaging/builddeb --cleanup --distid $DISTID --codename $CODENAME)
 if [ $(uname) = "Darwin" ] ; then
     $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
             sh -c "cd /mnt/$dn && make clean"
diff -r ca4de8ba5b5f -r c83ad57627ae tests/test-clonebundles.t
--- a/tests/test-clonebundles.t	Sat Jul 21 16:49:01 2018 +0900
+++ b/tests/test-clonebundles.t	Fri Aug 03 12:35:23 2018 -0700
@@ -286,6 +286,7 @@
   finished applying clone bundle
   searching for changes
   no changes found
+  2 local changesets published
 #endif
 
 Stream clone bundles are supported