Hi Jorge, I would have guessed that you would have to update the clone on google directly - isn't there some button there? :) But it now makes sense to me, too. Perhaps not bad to mention in the guide later on...
Cheers, Oktay. 2013/12/10 Jorge Cardoso Leitão <[email protected]> > Hi Oktay. > > Notice that I was trying to have my cloned rep in google (the one created > when you click "clone" in this > page<https://code.google.com/p/pyglet/source/checkout>) > that I can push to, but be able to synchronize it with Pyglet rep in order > to keep the rep updated. This means I need two remotes, the one you pointed > our, default, but one to the Pyglet rep. As you pointed out, with my > modification, I end up with two paths: > > [paths] > > default = https://[email protected]/r/jorgecarleitao-pyglet/ > > remote = https://code.google.com/p/pyglet/ > Regards, > Jorge > > On Tuesday, December 10, 2013 10:09:25 PM UTC+1, Oktay Acikalin wrote: >> >> Hi Jorge, >> >> if you clone the repo from google (e.g. hg clone …), your hg client >> should have added a "default" repo to your .hg/hgrc file automatically. So >> there should be no need to add it manually. You would then just use "hg >> pull" without mentioning the source. >> >> Cheers, >> Oktay. >> >> >> >> 2013/12/10 Jorge Cardoso Leitão <[email protected]> >> >>> Thanks a lot Juan. >>> >>> I'm not advocating GitHub, just pointing out that there may be other >>> people with the same background with similar confusions. >>> >>> The way hg works is different than git. In git you branch for a feature, >>>> in hg you clone per feature; so you don't upgrade your clone unless you >>>> want to "rebase" your changes before opening the issue asking for >>>> merge. >>> >>> >>> This was the missing concept. But I'm not sure it is really like that. >>> I've searched a bit and I can do the following: >>> After I clone to my local machine >>> >>> vim .hg/hgrc >>> >>> and add the line >>> >>> remote = https://code.google.com/p/pyglet/ >>> Then, using >>> >>> hg pull remote >>> >>> followed by >>> >>> hg update >>> brings the working tree to the current state of pyglet. From here I can >>> commit and push to my remote repository in google. >>> >>> So, a possible working flow is: >>> >>> 1. clone to google ("default") >>> 2. clone to local rep >>> 3. add remote = https://code.google.com/p/pyglet/ to .hg/hgrc >>> 4. create a branch >>> 5. make changes and commit >>> 6. hg pull remote followed by hg update (to update your code to the >>> latest version/resolve merge conflicts) >>> 7. push to your remote >>> 8. fill a ticket with the link the branch in your remote >>> >>> Any suggestions/improvements to this? I was hoping to add a (more >>> verbosed) list like this to contribute.xml. >>> >>> Cheers, >>> Jorge >>> >>> -- >>> You received this message because you are subscribed to the Google >>> Groups "pyglet-users" group. >>> To unsubscribe from this group and stop receiving emails from it, send >>> an email to [email protected]. >>> To post to this group, send email to [email protected]. >>> Visit this group at http://groups.google.com/group/pyglet-users. >>> For more options, visit https://groups.google.com/groups/opt_out. >>> >> >> -- > You received this message because you are subscribed to the Google Groups > "pyglet-users" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To post to this group, send email to [email protected]. > Visit this group at http://groups.google.com/group/pyglet-users. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "pyglet-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/pyglet-users. For more options, visit https://groups.google.com/groups/opt_out.
