www-infrastructure-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Braden Shepherdson (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (INFRA-6302) Adjusting branches on cordova-cli.git
Date Mon, 03 Jun 2013 15:07:20 GMT

    [ https://issues.apache.org/jira/browse/INFRA-6302?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13673193#comment-13673193
] 

Braden Shepherdson commented on INFRA-6302:
-------------------------------------------

Bump.

Discussion on the Cordova list[1] has decided in favour of option 2, if that is a permissible
option.

[1] http://mail-archives.apache.org/mod_mbox/cordova-dev/201305.mbox/browser
                
> Adjusting branches on cordova-cli.git
> -------------------------------------
>
>                 Key: INFRA-6302
>                 URL: https://issues.apache.org/jira/browse/INFRA-6302
>             Project: Infrastructure
>          Issue Type: Task
>      Security Level: public(Regular issues) 
>          Components: Git
>            Reporter: Braden Shepherdson
>
> Due to some mistakes in the past, the cordova-cli repo has abandoned the old master branch.
Now the state of development is the master2 branch.
> So we have two requests:
> First, can the HEAD be changed to point to master2, so that people get it when they clone?
> Second, can the old master branch be deleted? If not, we can delete its contents and
replace them with a README pointing people to master2.
> Sorry for the trouble. The old history was a tangle, and merging two long-lived branches
proved impossible because of bad rebases, and merges going from future->2.7.x->master
in the past, among other things.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

Mime
View raw message