We gave up on the automated move away from 'master' for creating releases: #994244: Rename the master branch to a proper version branch. But that doesn't mean it wasn't a great idea, it was just too risky.

So now, we need to provide information and evangelize the best practice of moving away from 'master'. This can mean updating best practices, promoting the change, having a page that explains it, etc.

CommentFileSizeAuthor
#19 release_node.png30.71 KBeliza411

Comments

rfay’s picture

And we can pester committers that have their projects set up this way (which used to be "best practice")

eliza411’s picture

Assigned: Unassigned » eliza411
Issue tags: +retest after build

Zen 7.x-3.x is an example of a dev release pointing at HEAD. After the build, I'll see if it's currently possible to move them:

http://git-dev.drupal.org/node/628464/edit

dww’s picture

It won't be possible to edit the node and change the branch it's pointing to. I never added any code in versioncontrol_release to handle this case, since I was under the impression that we'd never have HEAD/master release nodes given [ #953916] ...

Should this issue move to the versioncontrol_project issue queue, or is this a meta issue and we need another issue in vc_project to implement a work-around for this?

rfay’s picture

@dww, but does this workflow work?

1. Delete dev release node

2. Re-add dev release node on correct branch

Edit: This workflow works for admins, but regular project owners can't do it. Is there a way that we can allow dev releases to be deleted?

Josh The Geek’s picture

rfay: You can 1. cvs tag -b DRUPAL-n--n 2. Go to the release node and change the branch to DRUPAL-n--n from head (if the version works, you can change it now)

rfay’s picture

@josh, Even as admin, and as owner of the node, I can't change the branch on a release node on git-dev.

Josh The Geek’s picture

rfay: I meant on d.o. that could be a problem

rfay’s picture

One thing we could do would be to

1. Do a query to delete all dev release nodes that are attached to HEAD
2. Send an email to the dev list saying we'd done that and give people instructions on how to create a new one.

dww’s picture

Okay, see #1061592: Re-add special-case for editing release nodes pointing to master/HEAD to allow maintainers to move to a real branch for the issue to re-add this special case when editing release nodes over in the versioncontrol_project queue...

eliza411’s picture

Assigned: eliza411 » Unassigned

Unassigning this as I'm not working on it.

eliza411’s picture

Project: The Great Git Migration » Documentation
Component: Documentation » Missing documentation
Assigned: Unassigned » dww
Issue tags: -retest after build +git

@dww: I think I remember you helping people do this shortly after the migration, and I thought there was documentation created, but I can't find it. Do you know if there are docs and if not, can you help create them?

dww’s picture

There's no documentation about it. IMHO it's fairly self-explanatory, but of course I think so since I wrote the code. ;) I suppose we could add a page somewhere. However, I just spent about 10 minutes searching through our docs and didn't find a great place to put this. Maybe as a child of Full projects or something? I guess I'll try to find arianek in IRC and get her feedback.

This handbook page should mostly be about the best practice of not using 'master' for anything real and doing all work in a version-named branch. Then, there will be a section on the page for dealing with legacy releases still pointing to 'master' and how to move them to a version-named branch. So, perhaps this could even be a new subsection of the Release naming conventions page?

Anyway, I'm happy to generate content for this if I knew where to put it... ;)

eliza411’s picture

@danmuzyka and I have been handling organization of the Git docs and arianek will probably refer you back to one of us :) If you put it beneath the Release naming conventions, I'll see he takes a look. It makes sense to me to put it there.

- edit -

Also, thank you! :)

arianek’s picture

i absolutely would ;)

eliza411’s picture

See http://drupal.org/node/1127732 for sun's start on what to do with these.

dww’s picture

Assigned: dww » Unassigned

Yay, that's even more useful and detailed than the draft I would have written... thanks, sun! Procrastination++ ;)

Maybe we need to flesh out his point #2 with a screenshot or something, but this is basically all there is to say about the topic.

rfay’s picture

No, there is one more very important thing to say: #1074960: Let maintainers set a default branch on git repositories

Really, I'm hoping we can get that solved. Then we don't need a master for anything.

dww’s picture

@rfay: Absolutely, I agree that's a top priority -- it just doesn't exist yet. ;) I meant in terms of "missing documentation" we're now set (although arguably we could move that page somewhere more discoverable). As soon as #1074960 is done, we can definitely update this page and promote these moves even more vigorously.

Cheers,
-Derek

eliza411’s picture

StatusFileSize
new30.71 KB

I was going to add the screencap but the Git branch isn't editable, so I'm not sure what's supposed to happen in step 2.

eliza411’s picture

Status: Active » Fixed

Got the interface figured out and the screen caps added. Thanks rfay.

Status: Fixed » Closed (fixed)

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

greggles’s picture

For anyone else who needs to do this who finds this thread, the documentation is linked in comment #15: http://drupal.org/node/1127732