infra-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Brahma Reddy Battula (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (INFRA-18361) Cannot rebase the branch that has 60+ new commits
Date Tue, 21 May 2019 01:03:00 GMT

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

Brahma Reddy Battula commented on INFRA-18361:
----------------------------------------------

[~cml] Please find PMC consensus [mail|https://s.apache.org/lXU8]

It would be great if you could do this asap as it's blocking all commits. Only for HDFS-13891
branch as this jira says and not for "trunk'.

bq.I'm unclear why you need to force push, this is usually verboten, and was why the branches
were requested to be protected in the first place. It's going to be up to the PMC to decide
how that workflow should be handled, because force pushing rewrites history, and history is
critical to the Foundation. 

we are having development(Feature) branches which needs to be rebased periodically from main
branch ( trunk) based on the need.



> Cannot rebase the branch that has 60+ new commits
> -------------------------------------------------
>
>                 Key: INFRA-18361
>                 URL: https://issues.apache.org/jira/browse/INFRA-18361
>             Project: Infrastructure
>          Issue Type: Bug
>          Components: GitBox, Github
>            Reporter: Brahma Reddy Battula
>            Priority: Major
>         Attachments: After_Rebase.png, Current_branch_head.png
>
>
> I successfully rebased HDFS-13891 branch and force-push to GitBox but failed in GitHub.
They are now inconsistent. 
> brahma@brahma:~/trunk/hadoop$ git push origin HDFS-13891 -f 
> Username for 'https://gitbox.apache.org&#39;: brahma 
> Password for 'https://brahma@gitbox.apache.org&#39;: 
> Counting objects: 1660, done. 
> Delta compression using up to 4 threads. 
> Compressing objects: 100% (540/540), done. 
> Writing objects: 100% (1660/1660), 272.16 KiB | 34.02 MiB/s, done. 
> Total 1660 (delta 734), reused 1419 (delta 584) 
> remote: remote: error: GH006: Protected branch update failed for refs/heads/HDFS-13891.

> remote: remote: error: Cannot force-push to a protected branch 
> remote: To git@github:apache/hadoop.git 
> remote: ! [remote rejected] 756e4af76b504ab533d47a4d10d60f6eac4a60e4 -> HDFS-13891
(protected branch hook declined) 
> remote: error: failed to push some refs to 'git@github:apache/hadoop.git' 
> remote: Syncing refs/heads/HDFS-13891 (FORCED)... 
> remote: Error: 'NoneType' object has no attribute 'decode' 
> remote: Sending notification emails to: ['"common-commits@hadoop.apache.org" <common-commits@hadoop.apache.org>']

> remote: *** Too many new commits (60), not sending commit emails. 
> remote: *** Try setting multimailhook.maxCommitEmails to a greater value 
> remote: *** Currently, multimailhook.maxCommitEmails=50 
> remote: Error running hook: /x1/gitbox/hooks/post-receive.d/01-sync-repo.py 
> To https://gitbox.apache.org/repos/asf/hadoop.git 
>  + 206b08292be...756e4af76b5 HDFS-13891 -> HDFS-13891 (forced update) 



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Mime
View raw message