Mercurial > hg

changeset 38834:c83ad57627ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 03 Aug 2018 12:35:23 -0700
parents ca4de8ba5b5f (current diff) c9e6ca31cfe7 (diff)
children a232e6744ba3
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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"
--- 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