On Feb 8, 2007, at 8:55 PM, Kevin Reynen wrote: > Anyone have suggestions on how to deal with this? You really should make a DRUPAL-5--2 branch for the new features and maintain the DRUPAL-5 branch. That way you can work avoid interfering with the drupal-id's development work.