From 6335d60d8e9cd130a95d553c9621f6527ebad4a1 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 11 Oct 2009 11:13:18 +0200
Subject: [PATCH] Remove references to svn in 3.0.3 and use git

---
 regress/DartConfiguration.tcl.in     |  2 +-
 regress/DartConfiguration.tcl.in.old | 12 ------------
 regress/experimental-all             |  2 +-
 regress/experimental-disk            |  2 +-
 regress/experimental-disk-and-tape   |  2 +-
 regress/experimental-tape            |  2 +-
 regress/nightly-all                  |  2 +-
 regress/nightly-disk-and-tape        |  2 +-
 regress/nightly-tape                 |  2 +-
 regress/scripts/update-ctest.in      |  5 +++--
 10 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 regress/DartConfiguration.tcl.in.old

diff --git a/regress/DartConfiguration.tcl.in b/regress/DartConfiguration.tcl.in
index ca4bd1ff2f..26135b884e 100644
--- a/regress/DartConfiguration.tcl.in
+++ b/regress/DartConfiguration.tcl.in
@@ -10,5 +10,5 @@ TriggerSite: http://regress.bacula.org
 NightlyStartTime: 23:00:00 CET
 MakeCommand: @regressdir@/scripts/update-ctest
 ConfigureCommand: true
-UpdateCommand: svn
+UpdateCommand: true
 TimeOut: 1800
diff --git a/regress/DartConfiguration.tcl.in.old b/regress/DartConfiguration.tcl.in.old
deleted file mode 100644
index ededd963b2..0000000000
--- a/regress/DartConfiguration.tcl.in.old
+++ /dev/null
@@ -1,12 +0,0 @@
-SourceDirectory: @srcdir@
-BuildDirectory: @regressdir@
-Site: @sitename@
-BuildName: bacula-@bversion@-@bdate@-@dbengine@-@os@
-DropMethod: xmlrpc
-DropSite: http://regress.bacula.org:8081
-DropLocation: Bacula
-NightlyStartTime: 23:00:00 CET
-MakeCommand: @regressdir@/scripts/update-ctest
-ConfigureCommand: true
-UpdateCommand: svn
-TimeOut: 1800
diff --git a/regress/experimental-all b/regress/experimental-all
index 32c8a60771..df73917bf4 100755
--- a/regress/experimental-all
+++ b/regress/experimental-all
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
-svn update
+git pull
 scripts/config_dart
 nice ctest -D Experimental -R "^(disk|tape|changer):"
 rtn=$?
diff --git a/regress/experimental-disk b/regress/experimental-disk
index f5e68bb29e..a965df9242 100755
--- a/regress/experimental-disk
+++ b/regress/experimental-disk
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
-svn update
+git pull
 scripts/config_dart
 make setup
 nice ctest -D Experimental -R "^disk:"
diff --git a/regress/experimental-disk-and-tape b/regress/experimental-disk-and-tape
index f83880ef30..442370ded8 100755
--- a/regress/experimental-disk-and-tape
+++ b/regress/experimental-disk-and-tape
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
-svn update
+git pull
 scripts/config_dart
 nice ctest -D Experimental -R "^(disk|tape):"
 rtn=$?
diff --git a/regress/experimental-tape b/regress/experimental-tape
index 1addaca685..fecd7d86de 100755
--- a/regress/experimental-tape
+++ b/regress/experimental-tape
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
-svn update
+git pull
 scripts/config_dart
 nice ctest -D Experimental -R "^tape:"
 rtn=$?
diff --git a/regress/nightly-all b/regress/nightly-all
index d83d2f103a..7f817952a8 100755
--- a/regress/nightly-all
+++ b/regress/nightly-all
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
-svn update
+git pull
 make distclean
 scripts/config_dart
 nice ctest -D Nightly -R "^(disk|tape|changer):"
diff --git a/regress/nightly-disk-and-tape b/regress/nightly-disk-and-tape
index f2ffde2b32..f32bea5217 100755
--- a/regress/nightly-disk-and-tape
+++ b/regress/nightly-disk-and-tape
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
-svn update
+git pull
 make distclean
 scripts/config_dart
 nice ctest -D Experimental -R "^(disk|tape):"
diff --git a/regress/nightly-tape b/regress/nightly-tape
index d9235d431c..e4d3517181 100755
--- a/regress/nightly-tape
+++ b/regress/nightly-tape
@@ -9,7 +9,7 @@ save_debug=${REGRESS_DEBUG}
 REGRESS_DEBUG=1
 export REGRESS_DEBUG
 rm -rf Testing
-svn update
+git pull
 make distclean
 scripts/config_dart
 nice ctest -D Nightly -R "^tape:"
diff --git a/regress/scripts/update-ctest.in b/regress/scripts/update-ctest.in
index c33db1a639..e9fc1bf86c 100644
--- a/regress/scripts/update-ctest.in
+++ b/regress/scripts/update-ctest.in
@@ -11,11 +11,11 @@ fi
 
 cd @regressdir@/build 
 
-cur=`svn info | grep Revision: | awk '{print $2'}`
+cur=`cat git-version`
 
 cd @srcdir@
 
-new=`svn info | grep Revision: | awk '{print $2'}`
+new=`git show HEAD | grep -m 1 commit | awk '{print $2}'`
 
 cd @regressdir@
 
@@ -24,6 +24,7 @@ echo Source is ${new}
 
 if [ ${cur}x != ${new}x ] ; then
     echo "Newer version available, will run make setup"
+    git pull
     make setup
 else
     echo "Latest version present in build, skipping make setup"
-- 
2.39.5