There are some problems with the repository, which has resulted in 7.x-2.x-dev being older than 7.x-2.5

There are a number of commits to 7.x-2.5 that aren't in 7.x-2.x-dev, which makes it very confusing when trying to make patches.

Compare dev http://drupalcode.org/project/footnotes.git/shortlog/refs/heads/7.x-2.x and 2.5 http://drupalcode.org/project/footnotes.git/shortlog/refs/tags/7.x-2.5
- 2.5 has 4 extra commits.

The sooner this can be fixed the better but for now I will do my patch for 7.x-2.5

Comments

hingo’s picture

hingo CreditAttribution: hingo commented
Status: Active » Closed (won't fix)

Actually it's been like that already since cvs times. The branch names have to match certain patterns so that drupal.org will automatically publish different releases from them. When all of that is done, head seems to be superfluous.

Unless you can point to some Drupal documentation or provide a specific suggestion yourself, I'm just going to close this bug. (Ie, reopen if you do.)

rooby’s picture

rooby CreditAttribution: rooby commented
Status: Closed (won't fix) » Active

Sorry I don't mean work out of HEAD or MASTER, that seems to be long gone as the practice of choice.

I mean working out of branches for each major version, as this module has been doing.

The problem is that new commits should be done to 7.x-2.x and then when you want to make a new release you can tag a new version for drupal.org.

However, the last few commits have not been done to 7.x-2.x and are actually only in 7.x-2.5.
This means when the time comes for a new version 7.x-2.6 to be tagged from the 7.x-2.x branch, those commits will not be there as they are only in 7.x-2.5 specifically.

If you look at the two links in the original post and compare the logs, the last 4 changes from the 12th and 13th of march are only in 7.x-2.5 and not in 7.x-2.x.

An easy way to verify this is to download the latest dev version and see that the tinymce_footnotes module is still there.

rooby’s picture

rooby CreditAttribution: rooby commented

Thanks for the commit access, I can have a look into remedying this if you like.

Alse, if you have any rules you would like your committers to abide by or things you never want in the module etc. just let me know.

I would imaging I won't have time to do anything major to the module anyway, it will just review patches people commit etc. or fixing any bugs that come up.

hingo’s picture

hingo CreditAttribution: hingo commented

Ok, what you describe is not correct. Feel free to fix it.

Do you know how this happened btw? Did I just work against the wrong branch on my workstation, or is some setting wrong in the project settings?

rooby’s picture

rooby CreditAttribution: rooby commented

I'm not sure actually, I haven't seen that before.

I don't know how you would get a commit on the tag but not the branch.
Maybe I'll open a ticket on drupal.org and see if someone knows for interest sake.

rooby’s picture

rooby CreditAttribution: rooby commented
Status: Active » Fixed

I have fixed this now.

It just needed:

git clone --branch 7.x-2.x rooby@git.drupal.org:project/footnotes.git
git merge ce4e9500eaf283d995d7e24ee8c54bacc477f0da
git push

It would seem the commits were originally pushed into 7.x-2.5 but not into 7.x-2.x.

You can see the commits now show up at http://drupalcode.org/project/footnotes.git/shortlog/refs/heads/7.x-2.x

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.