Re: [ptp-dev] More questions about revising a fix after code review

[Roland Schulz <roland@xxxxxxx>]

On Mon, Jan 20, 2014 at 3:17 PM, David Wootton <drwootton@xxxxxxxxxx> wrote:

I'm trying to correct the fix for bug 424335 in Kepler and am confused again. I made my change in my workspace and tested it.

Now I'm trying to follow the steps for revising a patch as described in Part 3 on the Gerrit wiki page. I clicked Team->Remote->Fetch and entered 20637 (from the Gerrit URL https://git.eclipse.org/r/20637) and hit CTRL-space. This changed the value to 'refs/changes/37/20637/1/ I clicked 'Checkout FETCH_HEAD since the wiki page says checkout shuold be sufficient and clicked OK. That got me a popup as shown below.

I stopped at this point since I'm not sure a commit is going to include my changes or if I need to do something else.

As I mention on the wiki you can ignore that warning. If you don't want to get the warning you can also choose to create a local branch in the previous step. It doesn't have any disadvantage. 

 

Both Git and Gerrit are new to me and I don't want to do anything that gets my repository or the PTP repository in some broken state.

As long as you only commit for review (pushing to refs/for/master), you cannot mess up anything in the PTP repository. If you upload something incorrect for review you can always abandon the change. And if you get your local repository in a broken state you can always reset it to the upstream version:

- If your not on the master branch: Team->SwitchTo->master

- if it is still broken, reset by: Team->Reset->RemoteTracking->origin/master and choose ResetType hard

Roland

 

How do I proceed from here?

Dave

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