DRUPAL-5 CVS branch contains Drupal 6.x code
TR - July 24, 2008 - 03:19
| Project: | Currency Exchange |
| Version: | 5.x-1.x-dev |
| Component: | Code |
| Category: | task |
| Priority: | normal |
| Assigned: | Unassigned |
| Status: | closed |
Jump to:
Description
Re: the issue brought up in post #5&6 of http://drupal.org/node/281154
checking out HEAD gives me rev 1.4.2.11 2008/07/10,
checking out DRUPAL-5 also gives me the same rev 1.4.2.11 2008/07/10,
checking out DRUPAL-6--1 also gives me the same rev 1.4.2.11 2008/07/10,
checking out DRUPAL-5--1-1, however, gives me the previous rev - 1.4.2.10 2008/06/16
And your conclusion:
The DRUPAL-6--1 has the right code. However, the code in DRUPAL-5 is wrong, since it has the D6 code.
#1
Thanks for the reminder.
Fixed.
#2
OK, please forgive the newbie-ish question. I've used CVS on and off for years, but I'm not familiar with the accepted practices for using CVS in Drupal (and the docs aren't much help here either).
When I checked out the DRUPAL-5 branch of this module, I expected to get the head of the DRUPAL-5 branch. But what I got was something that is older than the DRUPAL-5--1-1 branch in the sense that it doesn't have fixes that were put in long ago (namely, the Egyptian pound symbol fix http://drupal.org/node/264661 and perhaps others). So DRUPAL-5 doesn't seem like the correct branch for me to be working with for new code development.
I have enhancements to this module I want to contribute (discussed in http://drupal.org/node/281154). In preparing a patch to add these enhancements, what branches should I be checking out and modifying? I was assuming I would develop against HEAD for the D6 version of the code and against DRUPAL-5 for the D5 version, but that's apparently not the case.
#3
This could be because of the "fix" I did that used old code for DRUPAL-5.
I don't have time now, but someone can go thru the history and ignore the commit before last, when DRUPAL-6 code was accidentally committed. Once we hunt down the correct revision, I can commit it and we should be good.
For Drupal 6.x, you have to use DRUPAL-6--1, which is the head for D6.
#4
#5
Automatically closed -- issue fixed for two weeks with no activity.