search

neo09 / gwt-platform

Automatically exported from code.google.com/p/gwt-platform
0 stars 0 forks source link

Issue 114 - Gene's First Commit #156

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago 
Purpose of code changes on this branch:

I have submitted my first proposed change to the library.  As this is my first 
contribution to this project and I am new to Mercurial.  I would like a review 
of this change.

When reviewing my code changes, please focus on:
The bug fix. 
The use of Mercurial was correct.

After the review, I'll merge this branch into:
/trunk

Original issue reported on code.google.com by drgenejones on 10 Aug 2010 at 3:43

GoogleCodeExporter commented 9 years ago 
I'll try to take a look at it today.

Original comment by philippe.beaudoin on 10 Aug 2010 at 3:49

GoogleCodeExporter commented 9 years ago 
Can you try to upload the change to codereview.appspot ?

Original comment by goudreau...@gmail.com on 10 Aug 2010 at 3:55

GoogleCodeExporter commented 9 years ago 
BTW, your forgot to push into a branch :D

Original comment by goudreau...@gmail.com on 13 Aug 2010 at 2:59

GoogleCodeExporter commented 9 years ago 
How do I push it into a Branch?  Is this something with Mercurial?

Original comment by drgenejones on 13 Aug 2010 at 3:01

GoogleCodeExporter commented 9 years ago 
Yes, do you use Ecplise ? 

If yes: Team>Add Branch
Commit
Push + Force

Original comment by goudreau...@gmail.com on 13 Aug 2010 at 3:08

GoogleCodeExporter commented 9 years ago 
command line:
hg branch BranchName
hg commit
hg push -f

Original comment by philippe.beaudoin on 13 Aug 2010 at 6:56

GoogleCodeExporter commented 9 years ago 
Has this been merged into the trunk? Can we close it?

Original comment by philippe.beaudoin on 14 Aug 2010 at 4:53

GoogleCodeExporter commented 9 years ago 
Not yet, need to test the change to boolean.  Placing in on Monday AM.

Original comment by drgenejones on 15 Aug 2010 at 5:05

GoogleCodeExporter commented 9 years ago 
Had some time Sunday, PM.  This is committed, I hope correctly to Mercurial.   
I haven't used Mercurial before so I am getting my head around the concepts.  I 
hope this is ok.  I have a confession in that I made a commit where the 
formatting changed, so I got the previous copy, and remade the changes without 
applying the autoformatting features so I think it is ok now.  The main problem 
was not putting a space in between function parameters and their delimiters or 
brackets.  

Hope its all ok, let me know otherwise and I will fix asap.

Cheers
Gene

Original comment by drgenejones on 16 Aug 2010 at 3:24

GoogleCodeExporter commented 9 years ago 
Hi Gene,

There were a number of issues in your push, mostly related

First of all, you should never force a push (with -f) unless you really know 
that you are creating a new named branch. In this push, your branch wasn't 
named and as a result you created 2 new heads. The problem with this is that 
people pulling the library update to (the latest) non-named head that was 
added. In this case, your head was missing a lot of the more recent features 
and caused projects building with the trunk to fail.

1) If you want to work directly in the trunk (i.e. for a small fix) the 
workflow is:
hg pull
hg update
...work...
hg pull
...some new changes? then:...
hg merge
hg commit
hg push
...get the error message about -f? DO NOT use it! it's the worst error message 
ever! wait and talk to someone...

2) If you work on your clone and want to pull back into the trunk then:
> Go to your own clone of the trunk
hg pull
hg pull https://drgenejones-nameOfYourClone.googlecode.com/hg/
hg merge
hg push

I strongly recommend you get tortoise hg, it greatly helps in visualizing the 
tree.

- - - - - - -

I don't blame you for any of this, btw. Getting to grip with mercurial takes 
some time. In the future I strongly recommend that you create a clone, work on 
it, ask somebody to "pull your changes" when your patch is ready. Somebody with 
more experience can do the steps in (2) from his own computer.

Meanwhile I'll consider this fixed. Thanks a lot for your contribution!

Original comment by philippe.beaudoin on 16 Aug 2010 at 6:44

GoogleCodeExporter commented 9 years ago 
Philippe, 

Thanks for the update.  I appreciate the advice as you can probably tell I am a 
beginner at Mercurial and this information is very useful.  

I think TortoiseHG is for Windows?  Do you have a recommendation for 
Linux-Ubuntu?

Cheers
Gene

Original comment by drgenejones on 16 Aug 2010 at 7:50

GoogleCodeExporter commented 9 years ago 
They say they have a linux version. I haven't tried it:
http://mercurial.selenic.com/wiki/TortoiseHg

Original comment by philippe.beaudoin on 16 Aug 2010 at 8:25