Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [ptp-dev] update site



On Wed, Oct 16, 2013 at 2:20 PM, Steven R. Brandt <sbrandt@xxxxxxxxxxx> wrote:
On 10/16/2013 01:11 PM, Roland Schulz wrote:



On Wed, Oct 16, 2013 at 10:06 AM, Steven R. Brandt <sbrandt@xxxxxxxxxxx> wrote:
That is indeed the problem. How do I fix it?
What is the problem? Do you have more than one commit or does your commit not have the correct line?

In the first case: Why do you have more than one commit? Do you want to commit several commits?
I have more than one commit, but for no good reason. I clicked on things incorrectly. I'm guessing I need to somehow rebase. Not sure about the incantation needed.

If all these commits are your commits and belong to the one thing you want to commit, and thus you just want to combine them into one commit, then you can do this with:

1) Team->Reset. Choose the branch you want to commit to (ptp_7_0/master). Choose Mixed/Soft (doesn't make a difference if you don't have uncommited changes). DON'T choose hard.
2) Recommit your changes. Now everything is going to be in 1 commit

Roland 


Cheers,
Steve

In the 2nd case: Use commit amend to fix the commit message.

Roland
 

Cheers,
Steve


On 10/15/2013 05:11 PM, Roland Schulz wrote:
Hi,

if you click 
Team->Show in History
activate the barrel icon "Show all changes in repository..."
and the branch icon "Show all Branches and tags"

Inline image 2

Do you see only 1 commit newer than origin/master?
If you click that on commit do you see the correct singed off line?

Roland



On Tue, Oct 15, 2013 at 5:13 PM, Steven R. Brandt <sbrandt@xxxxxxxxxxx> wrote:
On 10/15/2013 03:59 PM, Greg Watson wrote:
Eclipse will automatically add a correctly formatted message if you select the "Add Signed-off-by" button on the commit changes dialog.
I discovered this and tried it. Even with the Eclipse generated version, I get:


error: The author has not "signed-off" on the contribution.

Cheers,
Steve

Greg

On Oct 15, 2013, at 4:33 PM, Roland Schulz <roland@xxxxxxx> wrote:

Hi,

https://git.eclipse.org/r/Documentation/user-signedoffby.html shows the signed-off syntax. It should be:
Signed-off-by: Random J Developer <random@xxxxxxxxxxxxxxxxxxxxx>

Are you pushing to refs/for/master?

Roland


On Tue, Oct 15, 2013 at 12:31 PM, Steven R. Brandt <sbrandt@xxxxxxxxxxx> wrote:
OK, I've got changes I'd like to push to Gerrit, but there's something I've forgotten and can't seem to figure out.

When I try to push upstream, I get this error:

Repository ssh://sbrandtn08@xxxxxxxxxxxxxxx:29418/ptp/org.eclipse.ptp

The contributor must "sign-off" on the contribution.
Processing changes: refs: 1
Processing changes: refs: 1, done   
----------
Reviewing commit: commit 8e152afa98a5420f5d0d1a90806b895479c4cd1b 1381786508 ----sp
Authored by: Steven R. Brandt <sbrandt@xxxxxxxxxxx>

The author is not a committer on the project.
The author has a current Contributor License Agreement (CLA) on file.
error: The author has not "signed-off" on the contribution.
Please see http://wiki.eclipse.org/CLA

Apparently I'm having trouble getting the Signed-off-by: syntax correct. I've tried a number of things (email address, eclipse user name, name), but I keep getting the error message.

Cheers,
Steve


On 10/09/2013 03:27 PM, Beth Tibbitts wrote:
You overlooked the fact that (a) it wasn't quite right and (b) oops, we moved 7.0.0 to the archives.
Please try again.
Look now and see if it makes sense and works.
I'd paste it here but you are now a wiki tester :)

...Beth

Beth Tibbitts


On Wed, Oct 9, 2013 at 3:45 PM, Steven R. Brandt <sbrandt@xxxxxxxxxxx> wrote:
I can't access the update site from http://wiki.eclipse.org/PTP/environment_setup_80

I've tried my browser and adding it as an eclipse site. What am I overlooking?

  1. Download the PTP master archive of the previous major release of PTP. This will be a file named ptp-master-xxx.zip.


_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev




_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev




--
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309
_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev



_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev




--
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309 


_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev




--
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309 


_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev




--
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309

Back to the top