search

eclipse-californium / californium.tools

Californium project
Other
59 stars 57 forks source link

Update GUIController.java #33

Closed YonasJ closed 5 years ago

YonasJ commented 5 years ago

For the CoAP server I am connecting to, it returns a hierarchy. And this tool was not including the slashes between path elements, and returning extra errors while browsing the tree. This patch corrects both errors.

YonasJ commented 5 years ago

Signed the eclipse contribution agreement.

boaks commented 5 years ago

Hi @YonasJ

first thanks for your contribution! You already passed the first part of the legal boilerplate by signing the ECA. To pass the "checks", the second part will be signing the commit. That's done by git-signing in the commit message.

Signed-off-by: your name e-mail@e-mail

You must use the e-mail you used for the ECA (yonas.jongkind@gmail.com).

boaks commented 5 years ago

I possible, please add the { ... } and amend the change together with you signing to the commit. The force push them, and we will see, if the ip-validation will work.

boaks commented 5 years ago

Still thanks!

To pass the ip-validation, please "squash" your 3 commits into 1 commit and ensure, that that one is signed (as you already did for a6699a112ec). Then just push that commit "forced" to your branch.

YonasJ commented 5 years ago

I can't figure out how to do the squash. According to this documentation: https://help.github.com/articles/merging-a-pull-request/

It seems like there should be an option to squash, but I don't see that menu.

I tried to merge them in the client, but that just seemed to create more commits.

Any documentation about how to do the squash?

boaks commented 5 years ago

Do you use the eclipse IDE?

If so, http://www.vogella.com/tutorials/EclipseGit/article.html contains a lot of useful information. In http://www.vogella.com/tutorials/EclipseGit/article.html#actions-available-via-the-history-view you can see, how to use modify-squash.

So, now, after the merge, the 1. thing to do, please "reset --hard" your branch to the commit a6699a112 . http://www.vogella.com/tutorials/EclipseGit/article.html#moving-the-branch-pointer-with-git-reset contains the instructions. Then squash your commits to one.

Alternatively: Right now I pushed a "PR33" branch with the single commit into this eclipse repo. So fetch the origin, this should create a new remote-branch with name "origin/PR33". Then reset --hard your branch local branch "patch-1" to that commit 7f37541d6, and force push this to your repo.

If this doesn't work, and you agree, that I push it to the master branch, I can do this as well :-). That would show here "closed" instead of "merged", but your commit will be in the master and the comments here will document your PR.

YonasJ commented 5 years ago

Thanks for all that information.

I made the changes in my eclipse copy of the master repository. However, it's on the trunk and not my own branch.

I made the fix by making the same edit in the "Github" change file UI in the web.

If I had it checked out with Tortoise as i normally do, I think I could squash it. But I can't figure it out for the web version.

If you could accept this patch in this format, that would be great. And next time I will create my own branch and commit the normal way from Eclipse so squashing is easily possible.

boaks commented 5 years ago

Thanks! I pushed you commit 7f37541d6232 on master. Please document with a comment here, that the commit is according your changes, then I can close this PR.

boaks commented 5 years ago

Just to mention: In the meantime, we spend to most time in improving the 2.0.x branch. May be you consider to use that as well. I pushed your changes also to that branch.

YonasJ commented 5 years ago

Yeah, I started with this version as I am using eclipse smarthome, that uses this older version. I am also working on a patch for that one to update to a newer version.

Y.

Yonas Jongkind Office: (778) 898-9951 Mobile: (778) 268-1432 Skype: yonas.jongkind

In today’s materialistic world there is a risk of people becoming slaves to money, as though they were simply cogs in a huge money-making machine. This does nothing for human dignity, freedom, and genuine well-being. Wealth should serve humanity, and not the other way around. - Dalai Lama (Tibet)

Life is good!

On Thu, Jan 31, 2019 at 11:22 AM Achim Kraus notifications@github.com wrote:

Just to mention: In the meantime, we spend to most time in improving the 2.0.x branch. May be you consider to use that as well. I pushed your changes also to that branch.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/eclipse/californium.tools/pull/33#issuecomment-459472213, or mute the thread https://github.com/notifications/unsubscribe-auth/AMNodY5paaDyTa8nK1sXjK0xjtJR-WMPks5vI0KOgaJpZM4aXEO9 .

boaks commented 5 years ago

eclipse smarthome

OK, so 1.0.x will be the right one :-).