Yes, we all need to be using one remote, and that should be github. The website is authoritative. this became clear after the initial email. I apologize as I don't think this was made extra clear to all committers, and it is important. I see that there are some checks in the sync to even deal with this case (and rebase? hm, what if they conflict?) but certainly we should all push to one upstream repo.
Do we have a sense of who might have pushed to gitbox, to make sure they get the message? Right now they seem consistent again, so I can't ID the commit that went just to gitbox. That will have to be replayed. https://gitbox.apache.org/repos/asf?p=spark.git https://github.com/apache/spark/commits/master On Wed, Feb 13, 2019 at 12:34 AM Xiao Li <gatorsm...@gmail.com> wrote: > > The above instruction is different from what the website document: > https://github.com/apache/spark-website/commit/92606b2e7849b9d743ef2a8176438142420a83e5#diff-17faa4bab13b7530a3e1b627bb798ad0 > > Some committers are using gitbox, but the others are following the website > instruction and using github. > > Due to the mismatch, gitbox and github becomes inconsistent. I opened an > infra ticket. https://issues.apache.org/jira/browse/INFRA-17842 Hopefully, it > can be fixed soon. We should let all the committers follow the same way; > otherwise, it could break the commit history easily. > > Xiao > > > > > Sean Owen <sro...@apache.org> 于2018年12月10日周一 上午8:30写道： >> >> Per the thread last week, the Apache Spark repos have migrated from >> https://git-wip-us.apache.org/repos/asf to >> https://gitbox.apache.org/repos/asf >> >> >> Non-committers: >> >> This just means repointing any references to the old repository to the >> new one. It won't affect you if you were already referencing >> https://github.com/apache/spark . >> >> >> Committers: >> >> Follow the steps at https://reference.apache.org/committer/github to >> fully sync your ASF and Github accounts, and then wait up to an hour >> for it to finish. >> >> Then repoint your git-wip-us remotes to gitbox in your git checkouts. >> For our standard setup that works with the merge script, that should >> be your 'apache' remote. For example here are my current remotes: >> >> $ git remote -v >> apache https://gitbox.apache.org/repos/asf/spark.git (fetch) >> apache https://gitbox.apache.org/repos/asf/spark.git (push) >> apache-github git://github.com/apache/spark (fetch) >> apache-github git://github.com/apache/spark (push) >> origin https://github.com/srowen/spark (fetch) >> origin https://github.com/srowen/spark (push) >> upstream https://github.com/apache/spark (fetch) >> upstream https://github.com/apache/spark (push) >> >> In theory we also have read/write access to github.com now too, but >> right now it hadn't yet worked for me. It may need to sync. This note >> just makes sure anyone knows how to keep pushing commits right now to >> the new ASF repo. >> >> Report any problems here! >> >> Sean >> >> --------------------------------------------------------------------- >> To unsubscribe e-mail: dev-unsubscr...@spark.apache.org >> --------------------------------------------------------------------- To unsubscribe e-mail: dev-unsubscr...@spark.apache.org
