You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@impala.apache.org by Jim Apple <jb...@cloudera.com> on 2016/07/26 21:41:44 UTC

New instructins for devloping agains the Apache git repo

As you all know, we have now switched to using Apache git as our
upstream/source-of-truth. To switch to using it as your source-of-truth:


   1.

   Add a new git remote “apache” that tracks the ASF git repo
   1.

      git remote add apache
      https://git-wip-us.apache.org/repos/asf/incubator-impala.git
      2.

   Set up your gerrit remote for ASF as follows
   1.

      Use “git remote -v” to see your current gerrit remotes. You should
      see something like “gerrit ssh://
      jbapple-cloudera@gerrit.cloudera.org:29418/Impala (fetch)”.
      2.

      Copy the URL and modify it to change “Impala” to “Impala-ASF”, then
      add that as a remote with the name “asf-gerrit”: “git remote add
asf-gerrit
      ssh://jbapple-cloudera@gerrit.cloudera.org:29418/Impala-ASF”,
      changing the username to your username in your ‘gerrit’ git remote.
      3.

   Create a new local branch named “asf-gerrit-master” that tracks ASF
   master:
   1.

      git fetch asf-gerrit
      2.

      git checkout asf-gerrit/master
      3.

      git checkout -b asf-gerrit-master
      4.

      git branch --set-upstream-to=asf-gerrit/master asf-gerrit-master
      4.

   If you are a committer, set up your credentials at https://id.apache.org
   5.

   export DOWNLOAD_CDH_COMPONENTS=”true”
   1.

      Consider adding this to your .bashrc
      6.

   For your current code reviews, you can either migrate them now to being
   based on apache, or you can wait until they are +2ed. The bad news is that
   if you move them, you leave your gerrit comments behind, and if you don’t
   move them, you lose the ability to rebase.
   1.

      When you move them, go to the patch in gerrit and click “Download” in
      the upper right-hand corner. Then either “Cherry Pick” or download
      “Patch-File”
      1.

         Go to your command line and git checkout asf-gerrit-master
         2.

         Git pull
         3.

         Git checkout -b $SOME_NEW_BRANCH_NAME
         4.

         Then either
         1.

            Run the Cherry Pick command line
            2.

            Download the patch file and apply it using the ‘patch’ command.
            After applying it, git commit.
            5.

         Git push to gerrit as described below
         7.

   Develop as you usually do. When you are ready to push to gerrit:
   1. git push --no-thin asf-gerrit HEAD:refs/for/master

Re: New instructins for devloping agains the Apache git repo

Posted by Jim Apple <jb...@cloudera.com>.

Note: the gerrit project and URL has changed from "ImpalaASF" to
"Impala-ASF".

Here is is in plain text, since it apparently got mangled during sending:

1. Add a new git remote “apache” that tracks the ASF git repo
git remote add apache
https://git-wip-us.apache.org/repos/asf/incubator-impala.git

2. 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://
jbapple-cloudera@gerrit.cloudera.org:29418/Impala (fetch)”.
Copy the URL and modify it to change “Impala” to “Impala-ASF”, then add
that as a remote with the name “asf-gerrit”: “git remote add asf-gerrit
ssh://jbapple-cloudera@gerrit.cloudera.org:29418/Impala-ASF”, changing the
username to your username in your ‘gerrit’ git remote.

3. Create a new local branch named “asf-gerrit-master” that tracks ASF
master:
git fetch asf-gerrit
git checkout asf-gerrit/master
git checkout -b asf-gerrit-master
git branch --set-upstream-to=asf-gerrit/master asf-gerrit-master

4. If you are a committer, set up your credentials at https://id.apache.org

5. export DOWNLOAD_CDH_COMPONENTS=”true”
Consider adding this to your .bashrc

6. For your current code reviews, you can either migrate them now to being
based on apache, or you can wait until they are +2ed. The bad news is that
if you move them, you leave your gerrit comments behind, and if you don’t
move them, you lose the ability to rebase.
When you move them, go to the patch in gerrit and click “Download” in the
upper right-hand corner. Then either “Cherry Pick” or download “Patch-File”
Go to your command line and git checkout asf-gerrit-master
Git pull
Git checkout -b $SOME_NEW_BRANCH_NAME
Then either

(a) Run the Cherry Pick command line
(b) Download the patch file and apply it using the ‘patch’ command. After
applying it, git commit.

Git push to gerrit as described below

7. Develop as you usually do. When you are ready to push to gerrit:
git push --no-thin asf-gerrit HEAD:refs/for/master

On Tue, Jul 26, 2016 at 2:41 PM, Jim Apple <jb...@cloudera.com> wrote:

> As you all know, we have now switched to using Apache git as our
> upstream/source-of-truth. To switch to using it as your source-of-truth:
>
>
>    1.
>
>    Add a new git remote “apache” that tracks the ASF git repo
>    1.
>
>       git remote add apache
>       https://git-wip-us.apache.org/repos/asf/incubator-impala.git
>       2.
>
>    Set up your gerrit remote for ASF as follows
>    1.
>
>       Use “git remote -v” to see your current gerrit remotes. You should
>       see something like “gerrit ssh://
>       jbapple-cloudera@gerrit.cloudera.org:29418/Impala (fetch)”.
>       2.
>
>       Copy the URL and modify it to change “Impala” to “Impala-ASF”, then
>       add that as a remote with the name “asf-gerrit”: “git remote add asf-gerrit
>       ssh://jbapple-cloudera@gerrit.cloudera.org:29418/Impala-ASF”,
>       changing the username to your username in your ‘gerrit’ git remote.
>       3.
>
>    Create a new local branch named “asf-gerrit-master” that tracks ASF
>    master:
>    1.
>
>       git fetch asf-gerrit
>       2.
>
>       git checkout asf-gerrit/master
>       3.
>
>       git checkout -b asf-gerrit-master
>       4.
>
>       git branch --set-upstream-to=asf-gerrit/master asf-gerrit-master
>       4.
>
>    If you are a committer, set up your credentials at
>    https://id.apache.org
>    5.
>
>    export DOWNLOAD_CDH_COMPONENTS=”true”
>    1.
>
>       Consider adding this to your .bashrc
>       6.
>
>    For your current code reviews, you can either migrate them now to
>    being based on apache, or you can wait until they are +2ed. The bad news is
>    that if you move them, you leave your gerrit comments behind, and if you
>    don’t move them, you lose the ability to rebase.
>    1.
>
>       When you move them, go to the patch in gerrit and click “Download”
>       in the upper right-hand corner. Then either “Cherry Pick” or download
>       “Patch-File”
>       1.
>
>          Go to your command line and git checkout asf-gerrit-master
>          2.
>
>          Git pull
>          3.
>
>          Git checkout -b $SOME_NEW_BRANCH_NAME
>          4.
>
>          Then either
>          1.
>
>             Run the Cherry Pick command line
>             2.
>
>             Download the patch file and apply it using the ‘patch’
>             command. After applying it, git commit.
>             5.
>
>          Git push to gerrit as described below
>          7.
>
>    Develop as you usually do. When you are ready to push to gerrit:
>    1. git push --no-thin asf-gerrit HEAD:refs/for/master
>
>

Re: New instructins for devloping agains the Apache git repo

Posted by Tom White <to...@cloudera.com>.

On Tue, Jul 26, 2016 at 2:41 PM, Jim Apple <jb...@cloudera.com> wrote:
> As you all know, we have now switched to using Apache git as our
> upstream/source-of-truth.

That's great news. Thanks for all your hard work on this.

Cheers,
Tom

> To switch to using it as your source-of-truth:
>
>
>    1.
>
>    Add a new git remote “apache” that tracks the ASF git repo
>    1.
>
>       git remote add apache
>       https://git-wip-us.apache.org/repos/asf/incubator-impala.git
>       2.
>
>    Set up your gerrit remote for ASF as follows
>    1.
>
>       Use “git remote -v” to see your current gerrit remotes. You should
>       see something like “gerrit ssh://
>       jbapple-cloudera@gerrit.cloudera.org:29418/Impala (fetch)”.
>       2.
>
>       Copy the URL and modify it to change “Impala” to “Impala-ASF”, then
>       add that as a remote with the name “asf-gerrit”: “git remote add
> asf-gerrit
>       ssh://jbapple-cloudera@gerrit.cloudera.org:29418/Impala-ASF”,
>       changing the username to your username in your ‘gerrit’ git remote.
>       3.
>
>    Create a new local branch named “asf-gerrit-master” that tracks ASF
>    master:
>    1.
>
>       git fetch asf-gerrit
>       2.
>
>       git checkout asf-gerrit/master
>       3.
>
>       git checkout -b asf-gerrit-master
>       4.
>
>       git branch --set-upstream-to=asf-gerrit/master asf-gerrit-master
>       4.
>
>    If you are a committer, set up your credentials at https://id.apache.org
>    5.
>
>    export DOWNLOAD_CDH_COMPONENTS=”true”
>    1.
>
>       Consider adding this to your .bashrc
>       6.
>
>    For your current code reviews, you can either migrate them now to being
>    based on apache, or you can wait until they are +2ed. The bad news is that
>    if you move them, you leave your gerrit comments behind, and if you don’t
>    move them, you lose the ability to rebase.
>    1.
>
>       When you move them, go to the patch in gerrit and click “Download” in
>       the upper right-hand corner. Then either “Cherry Pick” or download
>       “Patch-File”
>       1.
>
>          Go to your command line and git checkout asf-gerrit-master
>          2.
>
>          Git pull
>          3.
>
>          Git checkout -b $SOME_NEW_BRANCH_NAME
>          4.
>
>          Then either
>          1.
>
>             Run the Cherry Pick command line
>             2.
>
>             Download the patch file and apply it using the ‘patch’ command.
>             After applying it, git commit.
>             5.
>
>          Git push to gerrit as described below
>          7.
>
>    Develop as you usually do. When you are ready to push to gerrit:
>    1. git push --no-thin asf-gerrit HEAD:refs/for/master