Re: [ptp-dev] GUI Terminal/Gerrit

["Steven R. Brandt" <sbrandt@xxxxxxxxxxx>]

I don't see why not.

Cheers,
Steve

On 11/14/2013 05:21 PM, Greg Watson wrote:

I think Beth also wanted to arrange a Gerrit session, so maybe we could do both at once?

Greg

On Nov 14, 2013, at 12:17 PM, Steven R. Brandt <sbrandt@xxxxxxxxxxx> wrote:

Thanks to Roland's help, I've finally managed to update my GUI Terminal code. It should be ready for another attempt through the review process. Maybe we'll get a chance to do something live at SC?

Cheers,
Steve

On 11/12/2013 08:11 PM, Roland Schulz wrote:

On Wed, Nov 6, 2013 at 4:27 PM, Steven R. Brandt <sbrandt@xxxxxxxxxxx> wrote:

My attempt to commit with amend failed. Perhaps this is because I did a git pull, in an effort to make sure nothing changed underneath my feet.

In any event, I'm now back to the situation in which it insists that I haven't signed off, even if I copy the sign off text from my previous commit.

I saw that I was 3 commits ahead, and tried to fix this the same way I did the last time.

   git rebase -i HEAD~3

I was expecting to see a list of my commits. Instead, I saw all the commits since my initial commit (much more than 3, which also surprised me). I left everything alone, i.e. I picked everything, but apparently the rebase still changed something. This is different than what I remember happening last time I attempted this same thing.

The was most likely be caused by having a merge commit within the last 3 commits. Interactive rebase doesn't work correctly in that case (both causing the problem that too many commits are shown and causing the problem that it changes things).

All you wanted to do is bring your commit to be on top of the history, correct? You don't need to do interactive rebase. The non-interactive rebase would have worked fine. 

I.e. if you local branch contains your commit and you want to rebase it so that you have the history of the upstream origin/master and ontop your commit you can do:

git rebase origin/master (or also simply "git rebase" without any option if your upstream branch config is correct)

If you have the situation as you had that you accidentally did a incorrect rebase you could have recovered by either:

a)

1) git log # write down sha1 of your commit

2) git reset --hard origin/master # resets your branch to the version seen upstream

3) git cherry-pick ${written down sha}

or b)

1) git reflog # find sha1 before rebase

2) git reset --hard ${sha you found}

But as I mentioned in the previous email you don't want to rebase during the review as it makes comparing different versions of your code difficult.

Instead you just want to do a commit amend without any pull/rebase/merge during a review cycle. If you don't happen to be on the same commit anymore you want to amend (i.e. you worked on something else in between), then you want to do a "git checkout" of the commit you want to amend.

Roland

 

The result is that I still can't commit because git says I didn't signed-off. Not sure what to do.

I think my biggest problem is that I only understand enough git to be dangerous.

Cheers,
Steve

On 10/30/2013 07:55 PM, Roland Schulz wrote:

On Wed, Oct 30, 2013 at 6:25 PM, Steven R. Brandt <sbrandt@xxxxxxxxxxx> wrote:

I've gone through https://git.eclipse.org/r/#/c/17427/ and fixed all but
one of the comments. Greg commented on plugin.xml taht the
preferencesPages should go in the "Remote Development" category.

I don't know what this means, and replied in Gerrit to that effect, but
my reply is labeled "Draft." I don't know if "Drafts" are visible to
others, or what I can do to get replies to not be labeled "Draft."

No. You have to click "Add Comment"->"Publish Comments" 

My next question is, how do I upload the new changes into gerrit? Can I
just do another push and will the review status reset?

Yes. You commit with amend and then you push.

 

Cheers,
Steve
_______________________________________________
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

_______________________________________________
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