Come together with the global Drupal community in Rotterdam, 28 Sept – 1 Oct 2026. Sessions, contribution, connection, and Early Bird savings until 8 June.Since the 6.x-1.x-dev release is based off the DRUPAL-6--1 branch, obviously its important that HEAD and DRUPAL-6--1 remain in sync. Unfortunately, they're off a little bit.
It looks like a couple changes were put into DRUPAL-6--1 and not into HEAD. And vice versa.
This is my best guess as to what lines are the most up-to-date. You should definitely review carefully. :-)
(btw, I just moved the .po files from pot to translations in CVS.)
| Comment | File | Size | Author |
|---|---|---|---|
| forward-sync-D6.patch | 3.57 KB | johnalbin | |
| forward-sync-HEAD.patch | 3.61 KB | johnalbin |
Comments
Comment #1
seanrThis should now be fixed. Sorry about that.