CVS issues with D6 <> D7 files mixed [#826542]

Comment #1

himerus CreditAttribution: himerus commented 14 June 2010 at 13:48

Assigned:

Unassigned

This should be fixed in 6.x-1.0-beta6.

Leaving as "active" until we can verify this isn't an issue any more... seems to work on my sandbox again. Still unsure on how the branches got all twisted together.

Log in or register to post comments

Comment #2

himerus CreditAttribution: himerus commented 15 June 2010 at 13:46

Status:

Active

» Fixed

Marking fixed after feedback. Still dont know what caused this, I'll have to pay more attention in the future!

Log in or register to post comments

Comment #3

Jacine

she/her

New York

CreditAttribution: Jacine commented 15 June 2010 at 21:07

Version:	6.x-1.0-beta5	» 7.x-1.x-dev
Status:	Fixed	» Active

Hey guys, I'm looking at the 7.x-dev version and seeing 6.x files in the starterkit directory. Maybe they got swapped by accident? I could post a new issue but I figure it's related to whatever happened here and just wanted to let you know in case you weren't aware.

Log in or register to post comments

Comment #4

himerus CreditAttribution: himerus commented 15 June 2010 at 21:13

Grrrr... I have no idea what happened to my CVS directories...
It's quite possible...
I do however have 8 demo subthemes setup in my D7 sandbox as I've been preparing my presentation for D4D, and they all seem to work... I will look at this a bit further, make sure everything is working and appropriate. (I know some files haven't changed between D6 and D7 version) and I forget the method CVS uses to tag files that are the same on multiple branches??

Thanks Jacine, I'll check it out, and see what I can figure out...
Let me know if you see any issues with actually using the starterkit in the latest beta release even with the wonky tag numbers on the files.

Log in or register to post comments

Comment #5

Jacine

she/her

New York

CreditAttribution: Jacine commented 15 June 2010 at 21:24

There's no making sense out of these things because CVS sucks... LOL.

I'll try the beta version instead and let you know if I see anything out of whack :)

Log in or register to post comments

Comment #6

Jacine

she/her

New York

CreditAttribution: Jacine commented 16 June 2010 at 07:10

Good news, I didn't have any issues subtheming with the beta version :D

Have fun and good luck with your D4D presentation! I'm really sad that I'm going to miss it this year. I'm sure you guys are gonna have a great time.

;)

Log in or register to post comments

Comment #7

himerus CreditAttribution: himerus commented 16 June 2010 at 13:45

Ah, you can ignore my "are you gonna be at D4D question" in the other issue!

I mostly fixed all the items inappropriately tagged last night, but didn't get them committed. Should all go up here shortly today.

Log in or register to post comments

Comment #8

himerus CreditAttribution: himerus commented 16 June 2010 at 14:22

Title:	D7 version of some files in D6 version	» CVS issues with D6 <> D7 files mixed
Status:	Active	» Fixed

The changes have been committed and tagged in the 7.x-1.0-beta3 release.

This should solve all the CVS issues... appears that I missed some steps in creating the 7.x branch, and didn't update properly to the new branch, so some files were removed, and after a proper cvs update, I had to replace in many changes (specifically to the starterkit)