Re: [Qgis-developer] update pull request
On Sat, May 7, 2011 at 10:55 AM, Charlie Sharpsteen wrote: > A better method would be: > > git checkout -b feature/x --track origin/release-1_7_0 > git checkout -b feature/y --track origin/realease-1_7_0 > Err, sorry---if you were following Tim's instructions, that should be: git checkout -b feature/x --track qgis-upstream/release-1_7_0 git checkout -b feature/x --track qgis-upstream/release-1_7_0 ___ Qgis-developer mailing list Qgis-developer@lists.osgeo.org http://lists.osgeo.org/mailman/listinfo/qgis-developer
Re: [Qgis-developer] update pull request
On Sat, May 7, 2011 at 9:28 AM, Tim Sutton wrote: > Hi > > On Sat, May 7, 2011 at 6:03 PM, Mayeul Kauffmann > wrote: > > Hi, > > Thanks all for your hints. Still, I could not find a way to make those > > changes on existing branch and on the pull request #3, so I forked again > and > > added a new pull request: > > Ok no need to refork, you can just do (in your local repo): > > git remote add qgis-upstream git://github.com/qgis/Quantum-GIS.git > git fetch qgis-upstream > git branch --track release-1_7_0 origin/release-1_7_0 > git checkout release-1_7_0 > git pull qgis-upstream release-1_7_0 > git push origin release-1_7_0 > > That will pull any changes from qgis repo and push them up to your > clone of it. Obviously you need to commit any fixes you made in > response to the comments and push those too. Then just issue a new > pull request and cancel the old one. > > I will write up some working practice docs in CODING soon I promise :-) > > Regards > > Tim Although it is *strongly* recommended to create a separate branch for each feature. For example, if you only use a release-1_7_0 branch: git branch --track release-1_7_0 origin/release-1_7_0 And work on two features, x and y you will have a problem when opening pull requests from that branch: The pull request for feature x will contain all commits for feature y and vice versa. A better method would be: git checkout -b feature/x --track origin/release-1_7_0 git checkout -b feature/y --track origin/realease-1_7_0 That sets up both branches so that `git pull` will bring in upstream changes, yet changes made by `git commit` are segregated. Pull requests opened from `feature/x` will only contain commits related to x. ___ Qgis-developer mailing list Qgis-developer@lists.osgeo.org http://lists.osgeo.org/mailman/listinfo/qgis-developer
Re: [Qgis-developer] update pull request
Hi, Thanks a lot Tim for the detailed commands! Will be useful for next time. While searching for documentation, I found several very good diagrams (including the one on the qgis wiki): http://osteele.com/archives/2008/05/commit-policies http://blog.interlinked.org/tutorials/git.html http://www.google.com/search?q=site:book.git-scm.com&um=1&ie=UTF-8&tbm=isch from http://book.git-scm.com/ The most detailed graphic cheat sheet I found is here: http://panela.blog-city.com/update_of_git_supervisual_cheatsheet.htm But on the project page you find an even more detailed svg a python script (I could not make it work, though, even after "sudo easy_install pysvg) I have added the first two of those here: http://www.qgis.org/wiki/Using_Git By the way, I also corrected the code formatting for braces in the, er..., editing section of the "good formatting example" at: http://www.qgis.org/wiki/Developers_Manual#Editing (should we run astyle on code extracts in the wiki? ;-) ) Hope this helps, Mayeul Le samedi 07 mai 2011 à 18:28 +0200, Tim Sutton a écrit : > Hi > > On Sat, May 7, 2011 at 6:03 PM, Mayeul Kauffmann > wrote: > > Hi, > > Thanks all for your hints. Still, I could not find a way to make those > > changes on existing branch and on the pull request #3, so I forked again and > > added a new pull request: > > Ok no need to refork, you can just do (in your local repo): > > git remote add qgis-upstream git://github.com/qgis/Quantum-GIS.git > git fetch qgis-upstream > git branch --track release-1_7_0 origin/release-1_7_0 > git checkout release-1_7_0 > git pull qgis-upstream release-1_7_0 > git push origin release-1_7_0 > > That will pull any changes from qgis repo and push them up to your > clone of it. Obviously you need to commit any fixes you made in > response to the comments and push those too. Then just issue a new > pull request and cancel the old one. > > I will write up some working practice docs in CODING soon I promise :-) > > Regards > > Tim > > https://github.com/qgis/Quantum-GIS/pull/7 > > > > In the meantime, there was a new commit in the 1_7_0 branch. > > (Yes, I know, it is "simple" to solve this but sorry, no, I'm not smart > > enough yet...). > > > > Sorry for those probably bad practices... > > > > Mayeul > > > > > > > > Le samedi 07 mai 2011 à 15:29 +0200, Sandro Santilli a écrit : > > > > On Sat, May 07, 2011 at 12:40:18PM +0200, Mayeul Kauffmann wrote: > > > >> I would have created a new personal repository forking > >> the main one and started from zero, but since it is not possible to > >> download a single branch, downloading all takes hours for me, so their > >> might be another commit in the mean time... this way I will never catch > >> up. > > > > There's no problem importing changes from upstream, git pull merges > > them in. > > > > Optionally the --rebase switch acts like if you created patches > > for your changes, updated the repository to upstream, and re-applied > > those patches. > > > > --strk; > > > > () Free GIS & Flash consultant/developer > > /\ http://strk.keybit.net/services.html > > > > > > > ___ Qgis-developer mailing list Qgis-developer@lists.osgeo.org http://lists.osgeo.org/mailman/listinfo/qgis-developer
Re: [Qgis-developer] update pull request
Hi On Sat, May 7, 2011 at 6:03 PM, Mayeul Kauffmann wrote: > Hi, > Thanks all for your hints. Still, I could not find a way to make those > changes on existing branch and on the pull request #3, so I forked again and > added a new pull request: Ok no need to refork, you can just do (in your local repo): git remote add qgis-upstream git://github.com/qgis/Quantum-GIS.git git fetch qgis-upstream git branch --track release-1_7_0 origin/release-1_7_0 git checkout release-1_7_0 git pull qgis-upstream release-1_7_0 git push origin release-1_7_0 That will pull any changes from qgis repo and push them up to your clone of it. Obviously you need to commit any fixes you made in response to the comments and push those too. Then just issue a new pull request and cancel the old one. I will write up some working practice docs in CODING soon I promise :-) Regards Tim > https://github.com/qgis/Quantum-GIS/pull/7 > > In the meantime, there was a new commit in the 1_7_0 branch. > (Yes, I know, it is "simple" to solve this but sorry, no, I'm not smart > enough yet...). > > Sorry for those probably bad practices... > > Mayeul > > > > Le samedi 07 mai 2011 à 15:29 +0200, Sandro Santilli a écrit : > > On Sat, May 07, 2011 at 12:40:18PM +0200, Mayeul Kauffmann wrote: > >> I would have created a new personal repository forking >> the main one and started from zero, but since it is not possible to >> download a single branch, downloading all takes hours for me, so their >> might be another commit in the mean time... this way I will never catch >> up. > > There's no problem importing changes from upstream, git pull merges > them in. > > Optionally the --rebase switch acts like if you created patches > for your changes, updated the repository to upstream, and re-applied > those patches. > > --strk; > > () Free GIS & Flash consultant/developer > /\ http://strk.keybit.net/services.html > > -- Tim Sutton - QGIS Project Steering Committee Member (Release Manager) == Please do not email me off-list with technical support questions. Using the lists will gain more exposure for your issues and the knowledge surrounding your issue will be shared with all. Visit http://linfiniti.com to find out about: * QGIS programming and support services * Mapserver and PostGIS based hosting plans * FOSS Consulting Services Skype: timlinux Irc: timlinux on #qgis at freenode.net == ___ Qgis-developer mailing list Qgis-developer@lists.osgeo.org http://lists.osgeo.org/mailman/listinfo/qgis-developer
Re: [Qgis-developer] update pull request
Hi, Thanks all for your hints. Still, I could not find a way to make those changes on existing branch and on the pull request #3, so I forked again and added a new pull request: https://github.com/qgis/Quantum-GIS/pull/7 In the meantime, there was a new commit in the 1_7_0 branch. (Yes, I know, it is "simple" to solve this but sorry, no, I'm not smart enough yet...). Sorry for those probably bad practices... Mayeul Le samedi 07 mai 2011 à 15:29 +0200, Sandro Santilli a écrit : > On Sat, May 07, 2011 at 12:40:18PM +0200, Mayeul Kauffmann wrote: > > > I would have created a new personal repository forking > > the main one and started from zero, but since it is not possible to > > download a single branch, downloading all takes hours for me, so their > > might be another commit in the mean time... this way I will never catch > > up. > > There's no problem importing changes from upstream, git pull merges > them in. > > Optionally the --rebase switch acts like if you created patches > for your changes, updated the repository to upstream, and re-applied > those patches. > > --strk; > > () Free GIS & Flash consultant/developer > /\ http://strk.keybit.net/services.html ___ Qgis-developer mailing list Qgis-developer@lists.osgeo.org http://lists.osgeo.org/mailman/listinfo/qgis-developer
Re: [Qgis-developer] update pull request
On Sat, May 07, 2011 at 12:40:18PM +0200, Mayeul Kauffmann wrote: > I would have created a new personal repository forking > the main one and started from zero, but since it is not possible to > download a single branch, downloading all takes hours for me, so their > might be another commit in the mean time... this way I will never catch > up. There's no problem importing changes from upstream, git pull merges them in. Optionally the --rebase switch acts like if you created patches for your changes, updated the repository to upstream, and re-applied those patches. --strk; () Free GIS & Flash consultant/developer /\ http://strk.keybit.net/services.html ___ Qgis-developer mailing list Qgis-developer@lists.osgeo.org http://lists.osgeo.org/mailman/listinfo/qgis-developer
Re: [Qgis-developer] update pull request
Hi, I do not know either what I good practice, but now that a new commit has been done on the branched 1_7_0 I have now idea how to propagate this in the pull request. I would have created a new personal repository forking the main one and started from zero, but since it is not possible to download a single branch, downloading all takes hours for me, so their might be another commit in the mean time... this way I will never catch up. So for the moment the easy way I found was to post a new patch here: http://trac.osgeo.org/qgis/attachment/ticket/3222/ (@Tim: it now uses relative paths) Patch on freshly branched 1_7_0 https://github.com/qgis/Quantum-GIS/commit/6c835b4cf5cd4a4be687e829bb57e3d51e7345f7 taking into accounts jef's comments at https://github.com/qgis/Quantum-GIS/pull/3 Would it be fine for you to work with this? I wish also to thank you for the hints you already gave me for improving my code. All the best, Mayeul Le vendredi 06 mai 2011 à 23:03 +0200, Mayeul Kauffmann a écrit : > Hi Jürgen, > > Thanks a lot for the detailed answer!! Sorry to have bothered you; I > agree standardizing indentation can be useful [in fact, it does not make > merging more difficult but easier: if indentation is standardized before > each commit, nobody will never ever have to merge indentation]. > > "But it's to late for that in your case anyway, as you've already > committed." > I would have forked the new 1_7_0 again, applied my patch here, taken > into account your comment, run the indentation tool, committed, pushed, > and made another pull request. Then I would have deleted my other fork > (is this good practice?) > > I will now work on your comments. > Regards, > Mayeul > > ___ > Qgis-developer mailing list > Qgis-developer@lists.osgeo.org > http://lists.osgeo.org/mailman/listinfo/qgis-developer ___ Qgis-developer mailing list Qgis-developer@lists.osgeo.org http://lists.osgeo.org/mailman/listinfo/qgis-developer
