Thanks for catching that, Andrey. I'll look into it. Ian
On Saturday, April 26, 2014, Andrey Kurdumov <kant2...@googlemail.com> wrote: > Currently documentation for plugins is broken.on both edge and 3.4 > versions, because links pointed to no longer existed branch in GitHub. > I file issue CB-6530 for that. > > > 2014-04-26 0:21 GMT+06:00 Ian Clelland <iclell...@chromium.org<javascript:;> > >: > > > This is now done. Buildbot will be broken until we update it to always > use > > master plugin branches; otherwise everything should be okay. > > > > For the morbidly curious: > > > > $ cordova-coho/coho repo-update -r plugins > > $ cordova-coho/coho foreach -r plugins "git checkout master; git merge > dev" > > $ echo -e "\nThis is \`dev\` - the deprecated development branch of this > > plugin; development of this plugin has moved to the \`master\` branch" >> > > notice > > $ cordova-coho/coho o foreach -r plugins "git checkout dev; git rm -r *; > > git checkout HEAD -- README.md; cat ../notice >> README.md; git add > > README.md; git commit -m 'CB-6521: Remove development branch'" > > $ cordova-coho/coho repo-push -r plugins > > > > > > On Fri, Apr 25, 2014 at 12:05 PM, Andrew Grieve <agri...@chromium.org > > >wrote: > > > > > Sounds good! There are a couple tweaks to coho to remove (yay) special > > > casing of plugin repos. I can make that change once you're done. > > > > > > Go for a rm -r commit on dev instead of removing the HEAD right away, > > > because I *think* if you delete the remote branch, then someone can > > > easily (and accidentally) re-push their version of dev up. > > > > > > > > > On Fri, Apr 25, 2014 at 11:47 AM, Michal Mocny <mmo...@chromium.org> > > > wrote: > > > > On Fri, Apr 25, 2014 at 11:42 AM, Ian Clelland < > iclell...@chromium.org > > > >wrote: > > > > > > > >> I've created https://issues.apache.org/jira/browse/CB-6521 to track > > > this > > > >> now. > > > >> > > > >> My plan is to merge all of the dev branches into master, and push > > that. > > > At > > > >> that point, anyone pushing new changes can just push directly to > > master, > > > >> and everything should be good. > > > >> > > > >> If I delete the dev branches immediately after doing that (really > just > > > the > > > >> branch name, at that point), is that going to interfere with > anyone's > > > >> workflow? I hope that anyone with outstanding changes on a dev > branch > > > can > > > >> just rebase them onto master after a git pull. > > > >> > > > >> Alternately, I can make a commit onto the dev branches that removes > > all > > > of > > > >> the code and replaces it with a "Development has moved to master" > > readme > > > >> file. That should cause a good merge conflict for anyone trying to > > > commit > > > >> to dev after that point, and will stop people from accidentally > > > recreating > > > >> the dev branch when they go to push. > > > >> > > > > +1 to that idea. > > > > > > > >> > > > >> > > > >> On Thu, Apr 24, 2014 at 4:11 PM, Andrew Grieve < > agri...@chromium.org> > > > >> wrote: > > > >> > > > >> > A good reference would be: > > > >> > > > > >> > > > > >> > > > > > > https://github.com/apache/cordova-coho/blob/master/docs/committer-workflow.md > > > >> > > > > >> > On Thu, Apr 24, 2014 at 1:58 PM, Piotr Zalewa < > pzal...@mozilla.com> > > > >> wrote: > > > >> > > I think we should have a sane contributing to Cordova page which > > > would > > > >> > > explain which branch does what. > > > >> > > > > > >> > > I agree master is a default for a bleeding edge with tags > > > representing > > > >> > > current release. > > > >> > > > > > >> > > Dnia Thu Apr 24 11:56:45 2014 Braden Shepherdson pisze: > > > >> > > > > > >> > >> Standardizing the release tag names
