Branch hell

joachim - November 2, 2009 - 15:04
Project:Override Node Options
Version:6.x-1.x-dev
Component:Code
Category:bug report
Priority:normal
Assigned:Unassigned
Status:active
Description

http://cvs.drupal.org/viewvc/drupal/contributions/modules/override_node_...

It looks like this module's been hopping between HEAD and DRUPAL-6--1 for its 6 series releases!
Potentially, this could mean that say the 1.9 release is missing fixes from 1.7 because they are one the other branch.

This is going to require comparing the latest from the two branches, and perhaps some fairly painstaking poring over previous commits.

For convention's sake, let's pick the DRUPAL-6--1 branch for ongoing work.

 
 

Drupal is a registered trademark of Dries Buytaert.