www-infrastructure-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Filip Maj (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (INFRA-6302) Adjusting branches on cordova-cli.git
Date Wed, 12 Jun 2013 21:00:21 GMT

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

Filip Maj commented on INFRA-6302:
----------------------------------

While we can delete/rename branches, I do not think we have the same permissions when it comes
to the {{master}} branch. The following attempts to delete the master branch on apache's server:

{code}
$ git push apache :master
remote: Rewinding refs/heads/master is forbidden.
remote:
To https://git-wip-us.apache.org/repos/asf/cordova-cli.git
 ! [remote rejected] master (pre-receive hook declined)
error: failed to push some refs to 'https://git-wip-us.apache.org/repos/asf/cordova-cli.git'
{code}

Not sure exactly what configuration INFRA has, but it makes sense to not allow rewriting history
for, at least, the master branch. Judging by the error message, there is a pre-receive hook
that checks for this stuff.

As for your earlier question re: mirrors, I think the safe bet is to destroy and recreate
the mirrors. I am not sure how resilient the mirroring system is so I wouldn't hold my breath...

Hope that helps!

P.S. i'll come idle in #asfinfra (nick: filmaj) should you have any other questions.
                
> 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