Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [ptp-dev] Process for commmitting PTP fix

It may not have been included. Can you update from the oxygen/staging repository and see if it works?

Greg

On Mar 7, 2018, at 4:31 PM, David Wootton <dwootton@xxxxxxxxxx> wrote:

Greg
I tried to verify my code fix for LSF using a ssh connection using the RC3 build, thinking my fix should be in that build since I finished the commit process Feb 22. I did see my code change in the PTP source repository. However, using the ssh (not proxy) connection today, It is not working at all. I get either the bqueues command exiting without returning anything to Eclipse, or I get a response with no queue info, almost as if the command timed out.

If my fix in RC3 or am I too early for that as well?

Dave

<graycol.gif>Greg Watson ---02/22/2018 10:11:09 AM---Dave, You need to completely replace the commit message with the text from the gerrit change. I foun

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





Dave,

You need to completely replace the commit message with the text from the gerrit change. I found it is better to reset the branch to the previous commit (HEAD^) and re-commit the changes with the correct comment rather than trying to amend the commit.

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

      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


      <1A578670.gif>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 8:06 AM, David Wootton <dwootton@xxxxxxxxxx> wrote:

Greg
I pasted the URL into this dialog

<1C504177.gif>
I hit finish and got prompted for username and password, which I entered and got the same error

<1C923625.gif>

I also tried the URL as
https://drwootton@xxxxxxxxxxxxxxx/r/ptp/org.eclipse.ptp with the same results.

I wonder if I am really authorized to push commits to PTP.

Dave


<graycol.gif>Greg Watson ---02/21/2018 07:44:33 AM---Dave, Change the repository URL to 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 07:44 AM
Subject:
Re: [ptp-dev] Process for commmitting PTP fix
Sent by:
ptp-dev-bounces@xxxxxxxxxxx






Dave,

Change the repository URL to https://git.eclipse.org/r/ptp/org.eclipse.ptp

Regards,
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=DOWRSVJSPQB_SuxhSwfAIucyrA2tfP-y6X2ZadhaP24&s=1Z1PqiIH8l03taZiJ1Ar3H-1gsYseBFOjYe7f-vBpxM&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=CKdyqrl3HICWjLf3IYm3x0Mklb641QzFTSGilA7z2Gk&s=Wvy3Wm3CrFcutmJaIhLoQu-OmDWD4X0MhoxpcD8Ngck&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


Back to the top