Mac install updates

[kyngchaos]

So if I cherry-picked this release-1_7_0 change into my master and request a pull, does it automatically pull the cherry-pick into the qgis master as well, or do I still have to request another pull from my master?

[timlinux]

Hi

On Sun, May 8, 2011 at 8:32 PM, kyngchaos
reply@reply.github.com
wrote:

So if I cherry-picked this release-1_7_0 change into my master and request a pull, does it automatically pull the cherry-pick into the qgis master as well, or do I still have to request another pull from my master?

As far as I know you would need to make two pull requests. Or you
could just put a comment in your first pull asking to please cherry
pick the change into master too (I'd probably typically do that anyway
unless the change was release branch specific).

Regards

Tim

Reply to this email directly or view it on GitHub:
#10

Tim Sutton - QGIS Project Steering Committee Member (Release  Manager)

Visit http://linfiniti.com to find out about:
 * QGIS programming services
 * Mapserver and PostGIS based hosting plans
 * FOSS Consulting Services

Skype: timlinux Irc: timlinux on #qgis at freenode.net

[timlinux]

You changes look good. Does your editor support word wrapping with newlines at 80chars (e.g. in vim highlight the line and then press 'gq')? It makes comparing versions much easier if this is the case. If it doesn't I will do it for you locally here.

Regards

Tim

[kyngchaos]

I can wrap lines, I was just lazy (I did some).

I see you are looking at the git change also, or did the pull request for the Mac update grab the later git change? I tried to make another pull request for that separately but it complained that I already had a request open, so I added it to my thread on the mailing list. Apply it (and maybe change it) if you like, it's just a suggestion for now.

[timlinux]

Hi

On Mon, May 9, 2011 at 12:25 AM, kyngchaos
reply@reply.github.com
wrote:

I can wrap lines, I was just lazy (I did some).

I see you are looking at the git change also, or did the pull request for the Mac update grab the later git change?  I tried to make another pull request for that separately but it complained that I already had a request open, so I added it to my thread on the mailing list.  Apply it (and maybe change it) if you like, it's just a suggestion for now.

I was using the github pull requests diff tool. I believe if you
change the branch being merged, you need to close the pull request and
open a new one. It could be that if you use a git commit with the
--amend option, the commit gets updated and so does the pull request.
I'll do a little test to confirm just now.

git commit --all --amend

The amend option basically lets you rewrite a previous commit.

Regards

Tim

Reply to this email directly or view it on GitHub:
#10 (comment)

Tim Sutton - QGIS Project Steering Committee Member (Release  Manager)

Visit http://linfiniti.com to find out about:
 * QGIS programming services
 * Mapserver and PostGIS based hosting plans
 * FOSS Consulting Services

Skype: timlinux Irc: timlinux on #qgis at freenode.net

[timlinux]

Hi again

Ok so I figured out how you can avoid making a second pull request.

Procedure:

Make some changes and commit locally.
Push to your gh fork
Issue a pull request

Change is rejected for whatever reason

Fix changes in your local repo but append your changes to your old commit with

git commit --amend

Now you need to push that commit again to your repo. By default it will be rejected with a message like this:

[qgis-github-clone] git push
To git@github.com:timlinux/Quantum-GIS.git
 ! [rejected]        release-1_7_0 -> release-1_7_0 (non-fast-forward)
error: failed to push some refs to 'git@github.com:timlinux/Quantum-GIS.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.

However (used with caution) the --force option can be added to your push command to force the change up to your repo.

git push --force

The GH pull request diff browser will now show the updated commit after a page refresh.

[timlinux]

H William

I added you to the committers list so you can go ahead and commit yourself as needed.

Regards

Tim

[kyngchaos]

OK thanks. I was thinking about asking for access after your latest comments on the dev list.

Sorry for not having a gravatar ;-) github needs the option to manually set an image, er, avatar.