[jira] [Resolved] (CB-6521) Merge plugin development branches into master

["Ian Clelland (JIRA)" <ji...@apache.org>]

     [ https://issues.apache.org/jira/browse/CB-6521?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Ian Clelland resolved CB-6521.
------------------------------

    Resolution: Fixed

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:
{code}
$ 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
{code}

> Merge plugin development branches into master
> ---------------------------------------------
>
>                 Key: CB-6521
>                 URL: https://issues.apache.org/jira/browse/CB-6521
>             Project: Apache Cordova
>          Issue Type: Task
>          Components: Plugin Battery Status, Plugin Camera, Plugin Console, Plugin Contacts, Plugin Device, Plugin Device Motion, Plugin Device Orientation, Plugin File, Plugin File Transfer, Plugin Geolocation, Plugin Globalization, Plugin InAppBrowser, Plugin Media, Plugin Media Capture, Plugin Network Information, Plugin SplashScreen, Plugin Statusbar, Plugin Vibration
>            Reporter: Ian Clelland
>            Assignee: Ian Clelland
>
> Following the mailing list discussion, all plugins development is going to take place on the master branch. Any current work on the "dev" branches should be merged in to master.
> After things settle down, the "dev" branch names should be deleted to prevent any accidental branching.
> *Update*: The dev branch is not being deleted; instead, all of the files within it are being removed, and the README is being updated to indicate that development should proceed on the master branch.



--
This message was sent by Atlassian JIRA
(v6.2#6252)