Please review http://drupal.org/node/1015226.
There should be a 7.x-1.x branch and a 7.x-2.x branch. Not 10 branches, one for each tag.
Once this is done, create a 7.x-1.x-dev release for the 7.x-1.x branch, so it can be used in the issue queues.

Also, it seems that none of the branches contain the 7.x-1.6 release?

Comments

bartk’s picture

bartk commented
Status: Needs review » Closed (fixed)
tim.plunkett’s picture

tim.plunkett
he/him
Primary language English
Location Philadelphia
commented
Status: Closed (fixed) » Fixed

http://drupal.org/node/156119#closed

It doesn't seem you deleted any of the extraneous branches, but at least there is one right one now.

bartk’s picture

bartk commented

Weird. I issued a number of "git branch -d -r origin/..." commands. I assumed that would do it. Did I miss something?

tim.plunkett’s picture

tim.plunkett
he/him
Primary language English
Location Philadelphia
commented

git push origin :branchname

The trick is the ":" before the branch name. You only deleted them locally.

bartk’s picture

bartk commented

Done. Did I get them this time?

Bart

tim.plunkett’s picture

tim.plunkett
he/him
Primary language English
Location Philadelphia
commented

Not that I see.

git push origin :7.x-1.2-dev-branch
git push origin :7.x-2.x-dev
git push origin :7.x-1.1-dev-branch
git push origin :7.x-1.0
git push origin :7.x-1.1
git push origin :7.x-1.1-dev

bartk’s picture

bartk commented

I thought that's what I did before, but I did it again just now.

I had issues with 7.x-1.0 and 7.x-1.1 because there were also tags with that name.

error: dst refspec 7.x-1.1 matches more than one.
error: failed to push some refs to 'lendrick@git.drupal.org:project/term_reference_tree.git'

Suggestions?

tim.plunkett’s picture

tim.plunkett
he/him
Primary language English
Location Philadelphia
commented

Ah, for the ones that match a tag, try
git push origin :refs/heads/7.x-1.0
git push origin :refs/heads/7.x-1.1

Thanks!

bartk’s picture

bartk commented

Okay, done. How's it look?

tim.plunkett’s picture

tim.plunkett
he/him
Primary language English
Location Philadelphia
commented

Awesome! Thanks for putting up with my nitpicking :)

bartk’s picture

bartk commented
Status: Fixed » Closed (fixed)

No problem, thanks for the help! :)

BArt

tim.plunkett’s picture

tim.plunkett
he/him
Primary language English
Location Philadelphia
commented
Status: Closed (fixed) » Fixed

See my comment in #2, the bot will move the issue after two weeks.

Status: Fixed » Closed (fixed)

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