Log of /contributions/modules/dbscripts/merge.php

---

Revision 1.2.4.1 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Feb 22 22:08:27 2009 UTC (9 months ago) by ceardach
Branch: DRUPAL-6--2
Changes since 1.2: +15 -1 lines
Diff to previous 1.2

Merging works, and other misc optimizations.

---

Revision 1.2 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 20 18:11:00 2009 UTC (10 months ago) by ceardach
Branch: MAIN
CVS Tags: HEAD
Branch point for: DRUPAL-6--1, DRUPAL-6--2
Changes since 1.1: +11 -2 lines
Diff to previous 1.1

Updating HEAD with the latest version of 5.x-1.x

---

Revision 1.1.2.4 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Sep 18 21:17:20 2008 UTC (14 months ago) by ceardach
Branch: DRUPAL-5
CVS Tags: DRUPAL-5--1-0, DRUPAL-5--1-1
Changes since 1.1.2.3: +9 -5 lines
Diff to previous 1.1.2.3 , to branch point 1.1 , to next main 1.2

Reworking the method to call help text, due to an unknown problem with help text being served when the sequences flag was called.

---

Revision 1.1.2.3 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Sep 18 18:53:57 2008 UTC (14 months, 1 week ago) by ceardach
Branch: DRUPAL-5
Changes since 1.1.2.2: +7 -2 lines
Diff to previous 1.1.2.2 , to branch point 1.1

Hopefully fixing several issues:

* Updating the content_copy.patch so it allows deleting files
* Fixing a bug caused by a missing 'break;'
* Everything that was in HEAD should now be in the DRUPAL-5 branch, which was a total mistake on my part
* Code cleanup to ensure no php error messages

---

Revision 1.1.2.2 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jul 6 14:20:35 2008 UTC (16 months, 2 weeks ago) by ceardach
Branch: DRUPAL-5
Changes since 1.1.2.1: +6 -0 lines
Diff to previous 1.1.2.1 , to branch point 1.1

Porting over changes made in HEAD to the 5.x branch.  Oops. I need to become more familiar with CVS.

---

Revision 1.1.2.1
Sat Jul 5 19:37:17 2008 UTC (16 months, 3 weeks ago) by ceardach
Branch: DRUPAL-5
Changes since 1.1: +0 -6 lines
FILE REMOVED

file merge.php was added on branch DRUPAL-5 on 2008-07-06 14:20:35 +0000

---

Revision 1.1 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Jul 5 19:37:17 2008 UTC (16 months, 3 weeks ago) by ceardach
Branch: MAIN
Branch point for: DRUPAL-5

Refactored how the scripts work, with various other improvements.

Moved all the heaving lifting to dbscripts.module as part of the first steps to make this more like a 'real' Drupal module and compatible with Drush.  Dump, restore, erase and merge scripts are now much smaller, just referencing the api in dbscripts.module.

Allowed extra flexibility to manage files more than just development.sql, production.sql and last-merge.sql.  It is now possible to dump and restore from any file name.

Fiexed up help text to be more descriptive.

Changed #!/usr/bin/php to #!/usr/bin/env php so the scripts have a greater chance of being compatible with more server environments.

Added support for picking charsets in an alternate location.  Nessisary to support uncommon server environments.