www-infrastructure-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Luke Han (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (INFRA-9021) Issue when migrate code from github.com to Apache Git
Date Thu, 15 Jan 2015 12:36:34 GMT

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

Luke Han commented on INFRA-9021:
---------------------------------

Thanks David. We are fine now. The code repo already migrated successfully.

Here's my approach for further reference:

First, you need to merge source and apache repo's commits:
>git clone git@github.com:KylinOLAP/Kylin.git
Then add apache repo as remote
>git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-kylin.git 
fetch and merge from apache master
>git fetch apache master
>git merge
Fix any conflict and commit, then push to source repo
>git commit
>git push

Now, you are fine to migrate:
>git clone git@github.com:KylinOLAP/Kylin.git --bare 
>git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-kylin.git 
>git push apache --mirror 

Thanks



> Issue when migrate code from github.com to Apache Git
> -----------------------------------------------------
>
>                 Key: INFRA-9021
>                 URL: https://issues.apache.org/jira/browse/INFRA-9021
>             Project: Infrastructure
>          Issue Type: Bug
>            Reporter: Luke Han
>
> There's issue blocked to migrate code (with all history) to Apache Git: 'failed to push
some refs to 'https://git-wip-us.apache.org/repos/asf/incubator-kylin.git'
> I have cleaned up all content/branch from Apache git but still not work yet.
> The reason maybe there are several commits already in Apache Git already.
> Could you please help to check is there anything wrong on sever side,
> Or, just help to reset Kylin's Apache Git ()?
> Thanks
> ====Logs====
> >git clone git@github.com:KylinOLAP/Kylin.git --bare
> >git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-kylin.git
> >git push apache -f --mirror
> Counting objects: 27038, done.
> Delta compression using up to 4 threads.
> Compressing objects: 100% (8428/8428), done.
> Writing objects: 100% (27038/27038), 60.85 MiB | 235.00 KiB/s, done.
> Total 27038 (delta 13128), reused 27038 (delta 13128)
> remote: Error: Command 'git merge-base 5f47109bb3f61588abed60297718ed2a766a5db1 494f47234a6db95ecd52594c39167f83b69866e9'
returned non-zero exit status 1
> To https://git-wip-us.apache.org/repos/asf/incubator-kylin.git
>  ! [remote rejected] gh-pages (pre-receive hook declined)
>  ! [remote rejected] master -> master (pre-receive hook declined)
>  ! [remote rejected] inverted-index -> inverted-index (pre-receive hook declined)
>  ! [remote rejected] staging -> staging (pre-receive hook declined)
>  ! [remote rejected] kylin-0.6.3 -> kylin-0.6.3 (pre-receive hook declined)
>  ! [remote rejected] v0.6.1 -> v0.6.1 (pre-receive hook declined)
>  ! [remote rejected] v0.6.1_mysql_auth -> v0.6.1_mysql_auth (pre-receive hook declined)
>  ! [remote rejected] v0.6.2 -> v0.6.2 (pre-receive hook declined)
>  ! [remote rejected] v0.6.4 -> v0.6.4 (pre-receive hook declined)
> error: failed to push some refs to 'https://git-wip-us.apache.org/repos/asf/incubator-kylin.git'
> >git remote -v
> apache	https://git-wip-us.apache.org/repos/asf/incubator-kylin.git (fetch)
> apache	https://git-wip-us.apache.org/repos/asf/incubator-kylin.git (push)
> origin	git@github.com:KylinOLAP/Kylin.git (fetch)
> origin	git@github.com:KylinOLAP/Kylin.git (push)



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

Mime
View raw message