From 200f4acd6d48282b4f0df91cfd59188e0b948a93 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 1 Jul 2014 18:42:03 +0000 Subject: [PATCH] Tweaked the bin/mergedevbranch script. - Legacy-Id: 8009 --- bin/mergedevbranch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/mergedevbranch b/bin/mergedevbranch index e3fc5738b..3832cbd18 100755 --- a/bin/mergedevbranch +++ b/bin/mergedevbranch @@ -178,10 +178,10 @@ M=$(svn st | cut -c 1-7 | grep -oh 'M' | head -n 1) C=$(svn st | cut -c 1-7 | grep -oh 'C' | head -n 1) G=$(svn st | cut -c 1-7 | grep -oh 'G' | head -n 1) -cd ../ -rsync -a $cwd/ merged@$rev/ -cp cicmd/commit-${rev}-merge.sh merged@$rev/commit -cd - +##cd ../ +##rsync -a $cwd/ merged@$rev/ +##cp cicmd/commit-${rev}-merge.sh merged@$rev/commit +##cd - echo -e "\nRunning tests" time ietf/manage.py test --settings=settings_sqlitetest || die "Tests failed.\nThe commit script is ../cicmd/commit-${rev}-merge.sh"