[commits] Horde branch master updated. e34a51f853eb62d0113c6ceaed9ba2e6b4bf85dc

[Michael Rubinsky]

The branch "master" has been updated.
The following is a summary of the commits.

from: 121014c7c062224b41d56eefa12c1257caca4807

a240375 Roll the conversion script for new style structure into the migration script.
cbf3c6c Add tag->content migration, remove old upgrade script
6b8f3f1 Add category migration, remove old upgrade script, catch some errors if migration run after some of these updates were already applied.
e34a51f Note that these upgrades are one way, some ws fixes, reset the style table on downgrade.

-----------------------------------------------------------------------

commit a240375b772411798e25d05af586baf439997dfd
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 6 10:46:05 2010 -0400

    Roll the conversion script for new style structure into the migration script.

 ansel/migration/3_ansel_upgrade_style.php            |   79 ++++++++++++++++-
 ansel/scripts/upgrades/2010-09-16_migrate_styles.php |   81 ------------------
 2 files changed, 76 insertions(+), 84 deletions(-)
 delete mode 100644 ansel/scripts/upgrades/2010-09-16_migrate_styles.php

http://git.horde.org/diff.php/ansel/migration/3_ansel_upgrade_style.php?rt=horde-git&r1=4ab10a7968fb202907354adbe923e87bfdaa6c98&r2=a240375b772411798e25d05af586baf439997dfd
http://git.horde.org/diff.php/ansel/scripts/upgrades/2010-09-16_migrate_styles.php?rt=horde-git&r1=4677fb7384087f5c8cf4c9553b03ee5ece14cf01&r2=a240375b772411798e25d05af586baf439997dfd

-----------------------------------------------------------------------

commit cbf3c6c09a6b7534cc0baf90b162fa0c4622f8e5
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 6 11:06:34 2010 -0400

    Add tag->content migration, remove old upgrade script

 ansel/migration/4_ansel_upgrade_tagstocontent.php             |   52 +++++++++
 ansel/scripts/upgrades/2010-07-30_migrate_tags_to_content.php |   39 ------
 2 files changed, 52 insertions(+), 39 deletions(-)
 create mode 100644 ansel/migration/4_ansel_upgrade_tagstocontent.php
 delete mode 100755 ansel/scripts/upgrades/2010-07-30_migrate_tags_to_content.php

http://git.horde.org/co.php/ansel/migration/4_ansel_upgrade_tagstocontent.php?rt=horde-git&r=cbf3c6c09a6b7534cc0baf90b162fa0c4622f8e5
http://git.horde.org/diff.php/ansel/scripts/upgrades/2010-07-30_migrate_tags_to_content.php?rt=horde-git&r1=d203a7efbff0ceb6ad304dcc5cde5b0f19ad30b4&r2=cbf3c6c09a6b7534cc0baf90b162fa0c4622f8e5

-----------------------------------------------------------------------

commit 6b8f3f18434e47e485271bcfa9891c8dd88585e2
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 6 11:24:41 2010 -0400

    Add category migration, remove old upgrade script, catch some errors if
    migration run after some of these updates were already applied.

 ansel/migration/3_ansel_upgrade_style.php                        |    2 +-
 ansel/migration/4_ansel_upgrade_tagstocontent.php                |   56 +++---
 ansel/migration/5_ansel_upgrade_categoriestotags.php             |   43 ++++
 ansel/scripts/upgrades/2010-09-16_migrate_categories_to_tags.php |   23 ---
 4 files changed, 77 insertions(+), 47 deletions(-)
 create mode 100644 ansel/migration/5_ansel_upgrade_categoriestotags.php
 delete mode 100644 ansel/scripts/upgrades/2010-09-16_migrate_categories_to_tags.php

http://git.horde.org/diff.php/ansel/migration/3_ansel_upgrade_style.php?rt=horde-git&r1=a240375b772411798e25d05af586baf439997dfd&r2=6b8f3f18434e47e485271bcfa9891c8dd88585e2
http://git.horde.org/diff.php/ansel/migration/4_ansel_upgrade_tagstocontent.php?rt=horde-git&r1=cbf3c6c09a6b7534cc0baf90b162fa0c4622f8e5&r2=6b8f3f18434e47e485271bcfa9891c8dd88585e2
http://git.horde.org/co.php/ansel/migration/5_ansel_upgrade_categoriestotags.php?rt=horde-git&r=6b8f3f18434e47e485271bcfa9891c8dd88585e2
http://git.horde.org/diff.php/ansel/scripts/upgrades/2010-09-16_migrate_categories_to_tags.php?rt=horde-git&r1=c1934161b08260b734354b79532a68f6fb2df42c&r2=6b8f3f18434e47e485271bcfa9891c8dd88585e2

-----------------------------------------------------------------------

commit e34a51f853eb62d0113c6ceaed9ba2e6b4bf85dc
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 6 11:29:28 2010 -0400

    Note that these upgrades are one way, some ws fixes, reset the style table on downgrade.

 ansel/migration/3_ansel_upgrade_style.php         |   10 ++++++++--
 ansel/migration/4_ansel_upgrade_tagstocontent.php |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

http://git.horde.org/diff.php/ansel/migration/3_ansel_upgrade_style.php?rt=horde-git&r1=6b8f3f18434e47e485271bcfa9891c8dd88585e2&r2=e34a51f853eb62d0113c6ceaed9ba2e6b4bf85dc
http://git.horde.org/diff.php/ansel/migration/4_ansel_upgrade_tagstocontent.php?rt=horde-git&r1=6b8f3f18434e47e485271bcfa9891c8dd88585e2&r2=e34a51f853eb62d0113c6ceaed9ba2e6b4bf85dc