[Koha-patches] [PATCH] Add comment in updatedatabase to reduce merge conflicts.

Ryan Higgins rch at liblime.com
Mon Jun 15 05:20:26 CEST 2009


Maintaining database updates that haven't been pushed to HEAD
results in frequent merge conflicts.  Adding a comment to separate
local modifications so that git will handle merging more cleanly.
No functional change.
---
 installer/data/mysql/updatedatabase.pl |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 58497c8..51e2270 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2467,6 +2467,11 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     print "Upgrade to $DBversion done (added FilterBeforeOverdueReport syspref and new index on authorised_values)\n";
 }
 
+
+#   End Published DB updates.
+#   Add any local db changes that aren't in Koha proper below this comment.
+
+
 =item DropAllForeignKeys($table)
 
   Drop all foreign keys of the table $table
-- 
1.5.6.2




More information about the Koha-patches mailing list