On Wed, Jul 20, 2016 at 11:54 AM, Jim Apple <[email protected]> wrote:
> Today, Impala's official source is at > https://github.com/cloudera/Impala/. As of Monday, July 25, it will be > at > https://git-wip-us.apache.org/repos/asf?p=incubator-impala.git. > > Unfortunately, for all of your in-progress patches in gerrit, you will > either have to > > (a) Abandon them and reprocue them in another gerrit repo (see below), or > > (b) Accept that you will not be able to rebase them in gerrit and that > you will have to reproduce them with another gerrit repo eventually. > This is because the gerrit Impala repo will no longer be updated - > instead, the ASF Impala repo will be the gerrit repo that tracks > active development. > > To change your local development environment over to using the new > official source: > > 1. If you are a committer, set up your credentials at > https://id.apache.org > > 2. Add a new git remote “asf” that tracks the ASF git repo > Correction: I think the remote needs to be named 'apache'. Because the push_to_asf.py script always looks for that: https://github.com/cloudera/Impala/blob/cdh5-trunk/bin/push_to_asf.py#L115 > git remote add asf > https://git-wip-us.apache.org/repos/asf/incubator-impala.git > > 3. Create a new branch named “asf-master” that tracks ASF master: > > git fetch asf > > git checkout asf/master > > git checkout -b asf-master > > git branch --set-upstream-to=asf/master asf-master > > 4. export DOWNLOAD_CDH_COMPONENTS=”true” > > Consider adding this to your .bashrc > > 5. Set up your gerrit remote for ASF as follows > > Use “git remote -v” to see your current gerrit remotes. You should see > something like “gerrit > ssh://[email protected]:29418/Impala (fetch)”. > > Copy the URL and modify it to change “Impala” to “ImpalaASF”, then add > that as a remote with the name “asf-gerrit”: “git remote add > asf-gerrit ssh://[email protected]:29418/ImpalaASF”, > changing the username to your username in your ‘gerrit’ git remote. > > Likewise, the remote for the ImpalaASF gerrit should be named 'gerrit': https://github.com/cloudera/Impala/blob/cdh5-trunk/bin/push_to_asf.py#L134 If folks would prefer leaving 'gerrit' as the remote name for their Cloudera pointed gerrit project, and prefer something else like 'asf-gerrit' for the Apache one, we need to change the script to reflect that. 6. Develop as you usually do. When you are ready to push to gerrit: > > git push --no-thin asf-gerrit HEAD:refs/for/master
