From a0f49cea3bd7fe2ed07e96e446974e314c05172e Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Wed, 23 Mar 2016 09:30:58 +0000
Subject: [PATCH] Task #8570: renamed dir from ResourceAssignmentDatabase to
ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict to prevent svn
EvilTwin merge conflict. Rename back on trunk.
---
.gitattributes | 12 ++++++------
.../sql/add_notifications.sql | 0
.../sql/add_resource_allocation_statics.sql | 0
.../sql/add_virtual_instrument.sql | 0
.../sql/create_add_virtual_instrument.sql.py | 0
.../sql/create_database.sql | 0
.../tests/fill_database.sql | 0
7 files changed, 6 insertions(+), 6 deletions(-)
rename SAS/ResourceAssignment/{ResourceAssignmentDatabase => ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict}/sql/add_notifications.sql (100%)
rename SAS/ResourceAssignment/{ResourceAssignmentDatabase => ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict}/sql/add_resource_allocation_statics.sql (100%)
rename SAS/ResourceAssignment/{ResourceAssignmentDatabase => ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict}/sql/add_virtual_instrument.sql (100%)
rename SAS/ResourceAssignment/{ResourceAssignmentDatabase => ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict}/sql/create_add_virtual_instrument.sql.py (100%)
rename SAS/ResourceAssignment/{ResourceAssignmentDatabase => ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict}/sql/create_database.sql (100%)
rename SAS/ResourceAssignment/{ResourceAssignmentDatabase => ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict}/tests/fill_database.sql (100%)
diff --git a/.gitattributes b/.gitattributes
index e639bf831e3..860a525a6ad 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4816,12 +4816,12 @@ SAS/OTDB/src/setStatus.conf -text
SAS/OTDB/test/tBrokenHardware.cc -text
SAS/OTDB/test/tMetadata.cc -text
SAS/OTDB/test/tQueryPIC.cc -text
-SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_notifications.sql -text
-SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_resource_allocation_statics.sql -text
-SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_virtual_instrument.sql -text
-SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_add_virtual_instrument.sql.py -text
-SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_database.sql -text
-SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/fill_database.sql -text
+SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/add_notifications.sql -text
+SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/add_resource_allocation_statics.sql -text
+SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/add_virtual_instrument.sql -text
+SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/create_add_virtual_instrument.sql.py -text
+SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/create_database.sql -text
+SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/tests/fill_database.sql -text
SAS/Scheduler/src/.default_settings.set -text
SAS/Scheduler/src/LOFAR_libScheduler.pro -text
SAS/Scheduler/src/conflictdialog.ui -text
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_notifications.sql b/SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/add_notifications.sql
similarity index 100%
rename from SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_notifications.sql
rename to SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/add_notifications.sql
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_resource_allocation_statics.sql b/SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/add_resource_allocation_statics.sql
similarity index 100%
rename from SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_resource_allocation_statics.sql
rename to SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/add_resource_allocation_statics.sql
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_virtual_instrument.sql b/SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/add_virtual_instrument.sql
similarity index 100%
rename from SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_virtual_instrument.sql
rename to SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/add_virtual_instrument.sql
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_add_virtual_instrument.sql.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/create_add_virtual_instrument.sql.py
similarity index 100%
rename from SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_add_virtual_instrument.sql.py
rename to SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/create_add_virtual_instrument.sql.py
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_database.sql b/SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/create_database.sql
similarity index 100%
rename from SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_database.sql
rename to SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/sql/create_database.sql
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/fill_database.sql b/SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/tests/fill_database.sql
similarity index 100%
rename from SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/fill_database.sql
rename to SAS/ResourceAssignment/ResourceAssignmentDatabase.from_branch_to_prevent_svn_conflict/tests/fill_database.sql
--
GitLab