www-infrastructure-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Mark Thomas (JIRA)" <j...@apache.org>
Subject [jira] [Resolved] (INFRA-6374) Rename branches in cordova-cli git repository
Date Mon, 10 Jun 2013 20:18:20 GMT

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

Mark Thomas resolved INFRA-6374.
--------------------------------

    Resolution: Duplicate

Duplicate of INFRA-6302
                
> Rename branches in cordova-cli git repository
> ---------------------------------------------
>
>                 Key: INFRA-6374
>                 URL: https://issues.apache.org/jira/browse/INFRA-6374
>             Project: Infrastructure
>          Issue Type: Bug
>      Security Level: public(Regular issues) 
>          Components: Git
>            Reporter: Braden Shepherdson
>
> Due to mistakes in the branching and merging of this repository, the history is a tangle
and merging two long-lived branches proved impossible without manually restoring some manually
reverted changes, among other damage.
> We have successfully rebased the master branch to repair the damage, and then merged
in the other long-lived branch. This branch now exists as master2.
> This naming, and the fact that HEAD still points at master, is a pain and we would much
rather rename the branches.
> We request that on the cordova-cli repository, master be renamed to old_master, and master2
be renamed to master. HEAD should point at this new master.
> The committers on the Cordova project are aware that this will require re-cloning of
the repository, and are prepared to take that step.

--
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