Plan for merging 6.x-3.x and master branches of PIFT and PIFR

Events happening in the community are now at Drupal community events on www.drupal.org.
rfay's picture
Posted by rfay on March 16, 2011 at 3:03am

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:

  1. 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).

  2. 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.

Comments

Update: PIFR merged

Posted by rfay on March 16, 2011 at 4:26am
rfay's picture

I merged 6.x-3.x into rfay/head_merge without a lot of trouble. Lots of merge conflicts, but to be expected. And they all seemed to have to do with work I'd done for the git migration, so were familiar territory. http://drupalcode.org/project/project_issue_file_review.git/commit/96520b1

PIFT rebased

Posted by boombatower on March 16, 2011 at 5:25am
boombatower's picture

I completed the rebase of git migration 6.x-3.x onto master, http://drupal.org/node/1094212. I also created an issue to track what we end up cherry picking or what not http://drupal.org/node/1094218. I think we should be safe (and would be simpler) to deploy what is already in there and just make any additional changes we may need.

Integration work ready for review (and deployment)

Posted by rfay on March 24, 2011 at 5:44pm
rfay's picture

Both are now ready for review in the PIFR and PIFT issue queues for everybody who wants to take a look. We should be able to deploy the new versions before long. With Jimmy's help I now have a better idea of the architecture of these modules, and am writing that up. Hopefully we can get this new code deployed soon.

As soon as we can get these deployed I'd like to start on being able to test modules that have dependencies. http://drupal.org/node/698932

Deployed today

Posted by rfay on March 29, 2011 at 4:11am
rfay's picture

This was deployed today and seems to be fine - solving a number of critical testing issues.

Testbots have to be updated and run updatedb as well

Drupal.org Testing Infrastructure

Group notifications

This group offers an RSS feed. Or subscribe to these personalized, sitewide feeds:

Hot content this week

See all hot content.