It quite difficult to choose what branch to take.

By adding a 7.x-1.x branch and if needed add some tags to declare a version stable it makes it a lot easier for others to choose from.

I guess your tags should be 7.x-1.0-alpha1 etc? If you think it's 7.x-1.x-beta1 then definitely promote it to a full project.

Comments

asherry’s picture

asherry CreditAttribution: asherry commented
Status: Active » Fixed

Good point, noted.

Branch "edavis_dev" has been deleted.
Branch "dev" has been moved into master.
Branch master has been moved to "7.x-1.x"

clemens.tolboom’s picture

clemens.tolboom
Primary language Dutch
Location Groningen, 🇳🇱/🇪🇺
CreditAttribution: clemens.tolboom commented

Cool. You fixed my 4 issues asap :-)

clemens.tolboom’s picture

clemens.tolboom
Primary language Dutch
Location Groningen, 🇳🇱/🇪🇺
CreditAttribution: clemens.tolboom commented
Status: Fixed » Needs work

According to http://drupalcode.org/sandbox/asherry/1477334.git/shortlog the master branch is still used.

So it's not quite right. You can delete a branch with git push origin :master IIRC

asherry’s picture

asherry CreditAttribution: asherry commented

Yeah I left the master branch for current development, I thought that's what you meant. As people download it I don't want them to download something that's in the middle of being worked on, but if people want to send patches they can use master.

I think I'm ready to release soon anyway, I just have to finish up with coding standards, (comments and proper syntax) and then polish the js charts a bit more. It will take a bit longer to release though because I have to apply for proper git access.

clemens.tolboom’s picture

clemens.tolboom
Primary language Dutch
Location Groningen, 🇳🇱/🇪🇺
CreditAttribution: clemens.tolboom commented

Well the drupal way is to have a version branch say 7.x-1.x on which you develop. Each commit delivers a new 7.x-1.x-dev zip

If you want to 'freeze' a version you add a tag. In your case I think 7.x-1.x-alpha1 would do for now.

Tools like drush don't like master branch.

It is allowed to break a -dev branch ;-)

Your project is still a sandbox and it's better for people to test the dev all the time.

asherry’s picture

asherry CreditAttribution: asherry commented

I merged everything into the 7.x-1.x branch, but it won't let me delete master.

remote: error: By default, deleting the current branch is denied, because the next
remote: error: 'git clone' won't result in any file checked out, causing confusion.
remote: error:
remote: error: You can set 'receive.denyDeleteCurrent' configuration variable to
remote: error: 'warn' or 'ignore' in the remote repository to allow deleting the
remote: error: current branch, with or without a warning message.
remote: error:
remote: error: To squelch this message, you can set it to 'refuse'.
remote: error: refusing to delete the current branch: refs/heads/master

clemens.tolboom’s picture

clemens.tolboom
Primary language Dutch
Location Groningen, 🇳🇱/🇪🇺
CreditAttribution: clemens.tolboom commented

You must change your default branch on http://drupal.org/node/1477334/edit/default-branch if possible for a sandbox

asherry’s picture

asherry CreditAttribution: asherry commented

The error message was after I already did that

clemens.tolboom’s picture

clemens.tolboom
Primary language Dutch
Location Groningen, 🇳🇱/🇪🇺
CreditAttribution: clemens.tolboom commented

Then you probably must switch away from the master branch I guess.

IIRC your should run but please read the documentation first.

git checkout 7.x-1.x
git branch -D master # delete local master
git push origin :master # delete remote master
asherry’s picture

asherry CreditAttribution: asherry commented
Status: Needs work » Fixed

Status: Fixed » Closed (fixed)

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

asherry’s picture

asherry CreditAttribution: asherry commented
Project: » d3.js
Version: » 7.x-1.x-dev
Issue summary: View changes