Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [ptp-dev] Problems with commit for fix for bug 424335 
Dave,

You shouldn’t get a new Gerrit URL because you’re just adding a new patch set to the original change. However, I don’t see a second patch set for https://git.eclipse.org/r/20211 so something is still not working. What message did you get?

To fix the conflicts, you’ll need to stash your changes (go to Git Repository Exploring perspective, right click on the repo, the select Stash Changes). This should revert your workspace back to a clean copy. You should then be able to pull. Assuming that worked, go back to the Git Repository Exploring perspective and open up the Stashed Commits folder in the repo. Right click on the stash and select Apply Stashed Changes. You’ll probably see some conflicts, but at least you should be able to resolve these. Then commit to your local repo again with the Change-Id from the original commit, and push to Gerrit.

Greg

On Jan 10, 2014, at 8:28 AM, David Wootton <drwootton@xxxxxxxxxx> wrote:

> I'm trying to commit a fix for bug 424335 in Luna based on code review comments.
> 
> I backed out my previous attempt to process this fix by abandoning the update in Gerrit and reverting back to the previous version in my workspace. Then I did a commit, using the changeid from my previous fix and a push to Gerrit.
> 
> This all worked for Kepler except I did not get a new Gerrit URL, maybe because I'm updating a previous attempt.
> 
> When I repeated this for Luna I got as far as attempting the commit, where I get a popup stating 'Internal error occurred' and 'no changes', even though I can see the file is changed in my workspace. I'm not sure what went wrong here.
> 
> Also, if I attempt a pull un Luna, I get a popup telling me I have conflicts even if I revert the file back to my first attempt at fixing bug 424335
> 
> Also, the project explorer view shows each project has 'up arrow 3 down arrow 5' beside it. In Kepler, after the push, I just have 'up arrow 3'
> 
> Dave
> _______________________________________________
> ptp-dev mailing list
> ptp-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/ptp-dev

Back to the top