Posted by joachim on November 2, 2009 at 3:04pm
4 followers
Jump to:
| Project: | Override Node Options |
| Version: | 6.x-1.x-dev |
| Component: | Code |
| Category: | bug report |
| Priority: | normal |
| Assigned: | Dave Reid |
| Status: | closed (fixed) |
Issue Summary
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.
Comments
#1
Talked with Tim on Twitter and I'm going to go ahead and merge the HEAD branch back into the DRUPAL-6--1 branch and put all D6 changes on DRUPAL-6--1. HEAD will be reserved for Drupal 7 when the time comes. Will update as fixed when finished.
#2
Thanks dave.
#3
Well, the awesome news is that the DRUPAL-6--1 AND HEAD branches are essentially the same thing except for the very last commit on the DRUPAL-6--1 branch (http://drupal.org/cvs?commit=243282). So we can pretty much just keep working on DRUPAL-6--1 for D6 and leave HEAD for Drupal 7 now.
#4
That's a relief! The CVS tree looks hideous! Was stuff somehow getting committed to both?
#5
That's what it looks like. Things were committed to both branches. Yeah, not as bad as we thought. :)
#6
Automatically closed -- issue fixed for 2 weeks with no activity.