Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[ptp-dev] Fw: Process for commmitting PTP fix

Greg
I looked at the update on git.eclipse.org and realized I probbaly reset the branch first then edited the file since I saw the version there was 9.2.0.

I redid the commit, pasting exactly what was in the text at git.eclipse.org but when I pushed the commit I got an error complaining about multiple change id lines even though I deleted the entry with change id 0 when pasting

I looked at my commit message in Eclipse by clicking amend commit and I see two change id lines. Seems like Eclipse is automatically generating the second one.

Dave
----- Forwarded by David Wootton/Poughkeepsie/Contr/IBM on 02/22/2018 08:17 AM -----

From: "David Wootton" <dwootton@xxxxxxxxxx>
To: Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>
Date: 02/22/2018 07:53 AM
Subject: Re: [ptp-dev] Process for commmitting PTP fix
Sent by: ptp-dev-bounces@xxxxxxxxxxx



Greg
The version of pom.xxml in my workspace for hptp_9_1 branch has a version string 9.1.4-SNAPSHOT. Do you want me to change that to just 9.1.4?

Comparing to previous version, the old string was 9.1.3-SNAPSHOT.

I'm not sure why this got updated anyway. I did not intentionally change it. Maybe the maven build changed it for some reason or maybe I accidentally touched it.

I did reset the commit as you noted.

Dave

Inactive hide details for Greg Watson ---02/21/2018 07:42:48 PM---Great. It looks like you committed something from the master Greg Watson ---02/21/2018 07:42:48 PM---Great. It looks like you committed something from the master branch to ptp_9_1 because the pom.xml h

From: Greg Watson <g.watson@xxxxxxxxxxxx>
To: Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>
Date: 02/21/2018 07:42 PM
Subject: Re: [ptp-dev] Process for commmitting PTP fix
Sent by: ptp-dev-bounces@xxxxxxxxxxx




Great. It looks like you committed something from the master branch to ptp_9_1 because the pom.xml has the wrong parent version. The easiest thing to do would be:

1. Reset to the previous commit in your workspace (use Reset to: HEAD^ and Reset type: mixed)
2. Modify the pom.xml so the parent version is 9.1.4
3. Commit again using the exact commit message (including the full change-id and signed-off-by). You can get this information from the change in Gerrit.
4. Push to gerrit.

This should show up as a second patchset which should hopefully build.

Regards,
Greg
          On Feb 21, 2018, at 5:57 PM, David Wootton <dwootton@xxxxxxxxxx> wrote:

          Greg
          I finally got Gerrit to accept this I think. Just changing signed off by didn't work, which kind of makes sense. I had to change the committer and author at the bottom of the commit window

          <1D849911.gif>

          Dave

          <graycol.gif>Greg Watson ---02/21/2018 04:42:02 PM---It needs to be able to link your email address to your gerrit account, so I think recommitting with

          From:           Greg Watson <g.watson@xxxxxxxxxxxx>
          To:           Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>
          Date:           02/21/2018 04:42 PM
          Subject:           Re: [ptp-dev] Process for commmitting PTP fix
          Sent by:           ptp-dev-bounces@xxxxxxxxxxx




          It needs to be able to link your email address to your gerrit account, so I think recommitting with the known email address would be easiest.

          Regards,
          Greg
                          On Feb 21, 2018, at 4:18 PM, David Wootton <dwootton@xxxxxxxxxx> wrote:

                          Greg
                          If I amend the commit again to change the signed of by line to my drwootton@... address, re-commit the try the push again, will that work or will that cause more problems (It looks like the bugzilla bug 530211 has my drwootton@... email, not my IBM email). I have access to both email accounts and don't care myself which one gets any review emails.

                          Dave


                          <graycol.gif>"David Wootton" ---02/21/2018 03:22:01 PM---Greg Why I try that URL, Firefox insists that it displays the page at.

                          From:                           "David Wootton" <dwootton@xxxxxxxxxx>
                          To:                           Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>
                          Date:                           02/21/2018 03:22 PM
                          Subject:                           Re: [ptp-dev] Process for commmitting PTP fix
                          Sent by:                           ptp-dev-bounces@xxxxxxxxxxx


                          Greg
                          Why I try that URL, Firefox insists that it displays the page at.                          https://git.eclipse.org/r/#/dashboard/self, where I am already logged in from a previous session and the page is titled 'Mt Reviews' with no reviews listed (which is correct)

                          If I manually change the URL to                           https://git.eclipse.org/r Firefox changes the URL to https://git.eclipse.org/r/r and displays a page with the message
                          The page you requested was not found, or you do not have permission to view this page

                          I am getting closer though. When I went to my account settings page at                           git.eclipse.org I realized my git/Gerrit id is dwootton, not drwootton (My registered email address is drwootton@... now and the dwootton account name is left over from prior to 2013)

                          Once I used the correct account name, I tried the push to gerrit again and this time it failed with a message I was using an email address which was not registered, which is correct since my current IBM email address is not registered with git/Gerrit.

                          So I went to the account settings page and tried registering a new email address. That resulted in a comfirmation email with a link being set to my IBM email address. I got the email, clicked the link and got a page that sais 'Code Review - Error Invalid token' and the registration failed :-( I tried pasting the link directly into both Firefox and Chrome and both failed.

                          I tried registering a new email address a second time with the same result.

                          Dave

                          <graycol.gif>Greg Watson ---02/21/2018 12:42:46 PM---Hi Dave, Can you sign in to Gerrit (https://urldefense.proofpoint.com/v2/url?u=https-3A__git.eclipse

                          From:                           Greg Watson <g.watson@xxxxxxxxxxxx>
                          To:                           Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>
                          Date:                           02/21/2018 12:42 PM
                          Subject:                           Re: [ptp-dev] Process for commmitting PTP fix
                          Sent by:                           ptp-dev-bounces@xxxxxxxxxxx





                          Hi Dave,

                          Can you sign in to Gerrit (https://git.eclipse.org/r)? When you do, go to account settings and HTTP password. You'll see your username, then click on the generate password button and use the username/password combination when Eclipse asks for it.

                          Greg
On Feb 21, 2018, at 7:24 AM, David Wootton <dwootton@xxxxxxxxxx> wrote:

Greg
Now I have the signed off line in the commit and I deleted the remote I configured. Then I tried Team->Remote->Push to Gerrit again and got prompted for a password. I went to https://git.eclipse.org/r/#/settings/http-password to get the password. There was nothing in the password filed of HTTP Password settings even though I have clicked 'Generate password' before. I clicked Generate password again, got a password and copied it to the password field in the dialog prompt, which resulted in the dialog
<1E192408.gif>

I also tried my regular Eclipse account password here before I realized that wasn't what I should be using and that didn't work either.

Dave
<graycol.gif>Greg Watson ---02/20/2018 08:13:14 AM---Dave, You'll have to amend the commit, or reset to the previous commit and re-commit, to add the Sig

From: Greg Watson <g.watson@xxxxxxxxxxxx>
To: Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>
Date: 02/20/2018 08:13 AM
Subject: Re: [ptp-dev] Process for commmitting PTP fix
Sent by: ptp-dev-bounces@xxxxxxxxxxx






Dave,

You'll have to amend the commit, or reset to the previous commit and re-commit, to add the Signed off line. There's a button on the "Commit Changes" dialog to add it. You also need to add a Change-Id using the button next to it.

I'm not sure why it's saying it couldn't connect to the repository. I use https://git.eclipse.org/r/ptp/org.eclipse.ptp for the origin remote and enter the credentials through the Git dialog, so you could try that. I think you already have this configured, so you could just remove the remote you have configured with the ssh URI. Use the Git perspective to manage the repo.

Regards,
Greg

On Feb 19, 2018, at 5:28 PM, David Wootton <dwootton@xxxxxxxxxx> wrote:

Greg
Guess I've been away from this for too long and have forgotten the process.
I committed my changes, but then realized I forgot to add the 'Signed off' line so I don't know how to fix that.

Something is also wrong with my ssh setup since I get the following when I try to push to Gerrit (Team->Remote->Push to Gerrit)
<18826309.gif>

I went to https://git.eclipse.org/r/#/settings/ssh-keys where I can upload ssh public keys and added what is supposed to be my ssh public key, which I got by opening the Key management tab in Preferences->General->Network Connections->SSH2, clicking Load Existing Key and picking the id_rsa file in that directory, then pasting the resulting public key into the git.eclipse.org page. I can see the key show up in the list at the top of the page but that still resulted in the same error when I tried the push again.

Either I have done something wrong or I need to wait more than a minute or two for updates to take effect.

Dave

<graycol.gif>Greg Watson ---02/19/2018 04:22:24 PM---Hi Dave, It looks like you already have it set up to use Gerrit. Have you tried committing your chan

From: Greg Watson <g.watson@xxxxxxxxxxxx>
To: Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>
Date: 02/19/2018 04:22 PM
Subject: Re: [ptp-dev] Process for commmitting PTP fix
Sent by: ptp-dev-bounces@xxxxxxxxxxx




Hi Dave,

It looks like you already have it set up to use Gerrit. Have you tried committing your changes then pushing to remote (or push to Gerrit?)

Greg
_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://urldefense.proofpoint.com/v2/url?u=https-3A__dev.eclipse.org_mailman_listinfo_ptp-2Ddev&d=DwICAg&c=jf_iaSHvJObTbx-siA1ZOg&r=yA1Giwd7Ls577uUKQ3fQWICGHopYggQ46OvlB30WK5M&m=G1T6JeX3hDbDk7op2LhlXUFZu82E-ikOmpVxGJc0cKc&s=uYLbN-9o7WqM0-KIk6Ns3_PiUP8Z24PCIyCXRbNLJbI&e=


_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/ptp-dev

_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://urldefense.proofpoint.com/v2/url?u=https-3A__dev.eclipse.org_mailman_listinfo_ptp-2Ddev&d=DwICAg&c=jf_iaSHvJObTbx-siA1ZOg&r=yA1Giwd7Ls577uUKQ3fQWICGHopYggQ46OvlB30WK5M&m=6n9TmfNckRv-6o5c-BmAkv-Q6K_rxRkR2n8CGGFSXjA&s=gK61XZFssjHOlLpSWRWEUM9KTPNPFats34060z20dLM&e=


_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/ptp-dev
_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://urldefense.proofpoint.com/v2/url?u=https-3A__dev.eclipse.org_mailman_listinfo_ptp-2Ddev&d=DwICAg&c=jf_iaSHvJObTbx-siA1ZOg&r=yA1Giwd7Ls577uUKQ3fQWICGHopYggQ46OvlB30WK5M&m=hyy7gmIOrkN4-66A7O4PEG6PgVFlTMdLnwLTL48EF_s&s=j9mBdKB_vYNS3NkdMlC6rDBlx3SSvqFD8lC7FuU_KnI&e=


_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://urldefense.proofpoint.com/v2/url?u=https-3A__dev.eclipse.org_mailman_listinfo_ptp-2Ddev&d=DwICAg&c=jf_iaSHvJObTbx-siA1ZOg&r=yA1Giwd7Ls577uUKQ3fQWICGHopYggQ46OvlB30WK5M&m=Ap0673Hh0wDJgqhO0wNN5PmnNGcugn8bHX33XjKCTBQ&s=NJaGySq1sfekZzeIrV_LHqEBs64fidtMC7su-qH93GU&e=

Back to the top