boombatower, DamZ, and I talked tonight about how to catch up to HEAD/master on PIFT and PIFR.
boombatower says there are protocol changes that have been implemented on the PIFR side but not PIFT, and probably HEAD of each won't talk to each other.
The plan:
-
rfay will create an experimental branch and try to merge all the 6.x-3.x work (git migration, since 6.x-2.2) into the former HEAD (master).
-
boombatower will review the PIFT issues and analyze which of those can be brought in. DamZ pointed out that it's important to make small changes on drupal.org, so we'd like to have only the protocol changes go into PIFT along with the bug fixes that were made there. boombatower will open a new experimental branch to work with these.
All in all, we want to get the code consolidated quickly (in the next couple of days hopefully) so that we can avoid endless and hopeless merging.