For review. I can perform the merge-commit, just let me know what needs to be changed. Pre conflict resolution: pvanhoof tinc:~/repos/gnome/tracker/trunk$ svn merge -r 2555:HEAD ../branches/turtle/ A src/tracker-indexer/tracker-removable-device.c A src/tracker-indexer/tracker-removable-device.h C src/tracker-indexer/tracker-main.c C src/tracker-indexer/tracker-indexer.c C src/tracker-indexer/Makefile.am U src/tracker-indexer/tracker-indexer.h U src/libtracker-data/tracker-data-query.c A src/libtracker-data/tracker-turtle.c U src/libtracker-data/tracker-data-query.h A src/libtracker-data/tracker-turtle.h U src/libtracker-data/tracker-data-metadata.c U src/libtracker-data/tracker-data-update.c U src/libtracker-data/tracker-data-metadata.h U src/libtracker-data/tracker-data-update.h U src/libtracker-data/Makefile.am C src/trackerd/tracker-main.c A src/trackerd/tracker-backup.c A src/trackerd/tracker-backup.h U src/trackerd/Makefile.am U src/libtracker-db/tracker-db-manager.c U src/libtracker-common/tracker-hal.c U src/libtracker-common/tracker-hal.h C ChangeLog C tests/tracker-indexer/Makefile.am U configure.ac U data/db/sqlite-stored-procs.sql pvanhoof tinc:~/repos/gnome/tracker/trunk$ Post conflict resolution: pvanhoof tinc:~/repos/gnome/tracker/trunk$ svn status | grep ^A A + src/tracker-indexer/tracker-removable-device.c A + src/tracker-indexer/tracker-removable-device.h A + src/libtracker-data/tracker-turtle.c A + src/libtracker-data/tracker-turtle.h A + src/trackerd/tracker-backup.c A + src/trackerd/tracker-backup.h pvanhoof tinc:~/repos/gnome/tracker/trunk$ svn status | grep ^C pvanhoof tinc:~/repos/gnome/tracker/trunk$ svn status | grep ^M M src/tracker-indexer/tracker-main.c M src/tracker-indexer/tracker-indexer.c M src/tracker-indexer/Makefile.am M src/tracker-indexer/tracker-indexer.h M src/libtracker-data/tracker-data-query.c M src/libtracker-data/tracker-data-query.h M src/libtracker-data/tracker-data-metadata.c M src/libtracker-data/tracker-data-update.c M src/libtracker-data/tracker-data-metadata.h M src/libtracker-data/tracker-data-update.h M src/libtracker-data/Makefile.am M src/trackerd/tracker-main.c M src/trackerd/Makefile.am M src/libtracker-db/tracker-db-manager.c M src/libtracker-common/tracker-hal.c M src/libtracker-common/tracker-hal.h M ChangeLog M tests/tracker-indexer/Makefile.am M configure.ac M data/db/sqlite-stored-procs.sql pvanhoof tinc:~/repos/gnome/tracker/trunk$ pvanhoof tinc:~/repos/gnome/tracker/trunk$ svn diff > /tmp/turtle-to-trunk.diff pvanhoof tinc:~/repos/gnome/tracker/trunk$ -- Philip Van Hoof, freelance software developer home: me at pvanhoof dot be gnome: pvanhoof at gnome dot org http://pvanhoof.be/blog http://codeminded.be
Attachment:
turtle-to-trunk.diff
Description: Text Data