Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 457736

Summary: Fix undefine in saveHook.html
Product: [ECD] Orion Reporter: Paul Webster <pwebster>
Component: ClientAssignee: Mei-Vern Then <mt2837>
Status: RESOLVED FIXED QA Contact:
Severity: trivial    
Priority: P3    
Version: 8.0   
Target Milestone: 8.0   
Hardware: PC   
OS: Linux   
Whiteboard:

Description Paul Webster CLA 2015-01-16 13:39:50 EST
Add an eslint directive to fix the error.  See http://eslint.org/docs/configuring/

Path: org.eclipse.orion.client / bundles / org.eclipse.orion.client.ui / web / content / saveHook.html
Comment 1 Mei-Vern Then CLA 2015-01-26 16:14:20 EST
Bug fixed.
 
Gerrit URL: https://git.eclipse.org/r/40401
Comment 2 Mei-Vern Then CLA 2015-01-29 20:28:16 EST
Amended the commit message and rebased on master successfully. When trying to push however, it gives me the following error:

remote: Reviewing commit: 2848d2f2
remote: Authored by: Mike Rennie <Michael_Rennie@ca.ibm.com>
remote: 
remote: The author is a committer on the project.
remote: 
remote: error: You are not a project committer.
remote: error: Only project committers can push on behalf of others.
remote: Please see http://wiki.eclipse.org/CLA
remote: 
To https://mthend3x@git.eclipse.org/r/orion/org.eclipse.orion.client
 ! [remote rejected] HEAD -> refs/for/master (You must be a committer to push on behalf of others.)
error: failed to push some refs to 'https://mthend3x@git.eclipse.org/r/orion/org.eclipse.orion.client'

According to https://git.eclipse.org/r/Documentation/error-invalid-committer.html#_missing_privileges_to_push_commits_that_were_committed_by_other_users, I may not have the right privileges, in which case I'm not quite sure how to fix this. Please let me know, and thanks!
Comment 3 Paul Webster CLA 2015-01-29 20:38:57 EST
Here's trick for  getting out of this scenario.

create a new branch, tmp, where you are.  That way you can find your amended commit.

Then checkout master, and make sure the top says master => origin/master

Find the commit at the tip of master, if it's not obvious from the History section have a look at http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/log/

select the commit that's at the tip of origin/master, and then look at the icons above the difference.  One looks like a 3/4 circle, and if you hover over it says Reset..  Use that to reset master (don't keep your workspace).

Then you've fixed master to point to origin/master.

After that, select your tmp branch in the dropdown so the top says master => tmp and your amended commit shows up in the outgoing again.  Select that commit, and use the cherry-pick to pull that over to master.  Now, you can switch to gerrit/for/master and push again.

PW
Comment 4 Paul Webster CLA 2015-01-30 21:52:27 EST
Thanks Mei-Vern, released as http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=d56d7981af648d76418afa5e7064b313dc0e5ca2

Just a note, when adding Change-Id or Signed-off-by they have to be in the commit message footer.