Partially upgrading using the auto-updater

From PeopleAggregator

Jump to: navigation, search

If you have tried to update your PeopleAggregator install using the built in updater and it tells you that it can't update cleanly because you have files with conflicting changes, you have a decision to make.

The safest thing to do now is back up your PA install, click the 'overwrite everything' button, then merge your changes back into the updated install.

If you're lucky, clicking the 'only update files without conflicts' button will work, but it is very likely to result in a broken install. If you have already done this and found that your PA install doesn't work any more, you have a few choices.

[edit] Transition to Subversion

If you want to run modified PA source code but still keep up to date, the easiest thing to do is to use Subversion, which will automatically merge your changes in with ours. Follow the Transitioning to Subversion for updates guide to move over.

[edit] Manually updating files

Alternatively you can find and update the files individually like this:

  • download the latest tarball
  • in mysql, do this: 
mysql> select * from svn_objects where held_revision is not null;
+------------------+------+----------------------------------+----------+-----------+---------------+
| path             | kind | hash                             | revision | is_active | held_revision |
+------------------+------+----------------------------------+----------+-----------+---------------+
| web/homepage.php | file | a6f3ac29057f7b09c3250289fc4b140f |       16 |         1 |            16 |
| config.inc       | file | e2454115a72ca2e298f1df2a2e896768 |       16 |         1 |            16 |
+------------------+------+----------------------------------+----------+-----------+---------------+
2 rows in set (0.01 sec)
  • now copy those files (whatever shows up in the results of the query) from the tarball over the top of the corresponding files in the installation (perhaps backing up the installation, or at least those files, first), or diff them against the latest version and merge our changes in with yours.
  • now back in mysql (note: replace 22 below with the revision number in the name of the tarball you downloaded): 
update svn_objects set revision=22, held_revision=NULL where held_revision=NULL;
  • Then you will be able to continue using the updater, although you'll have to backup, overwrite, then merge every time you update. Subversion is a bit easier.

[edit] (One day) using the built-in held files admin tool

This isn't written yet, so you can't do it right now, but at some point there'll be a 'held files' link on the updater menu that you'll be able to click to see the files that you have changed, and manually update each one.

Retrieved from "http://wiki.peopleaggregator.org/Partially_upgrading_using_the_auto-updater"
Personal tools