addressalign-toparrow-leftarrow-rightbackbellblockcalendarcameraccwcheckchevron-downchevron-leftchevron-rightchevron-small-downchevron-small-leftchevron-small-rightchevron-small-upchevron-upcircle-with-checkcircle-with-crosscircle-with-pluscrossdots-three-verticaleditemptyheartexporteye-with-lineeyefacebookfolderfullheartglobegmailgooglegroupsimageimagesinstagramlinklocation-pinm-swarmSearchmailmessagesminusmoremuplabelShape 3 + Rectangle 1outlookpersonJoin Group on CardStartprice-ribbonImported LayersImported LayersImported Layersshieldstartickettrashtriangle-downtriangle-uptwitteruseryahoo

Re: [ruby-81] git and patch protocols...

From: Sam G.
Sent on: Wednesday, September 9, 2009 9:37 AM
Git has functionality built in for creating patches and applying them.
The Ruby on Rails Lighthouse page has a good description on how to do
this. ��It should apply equally well to Cucumber or any other project.


The most relevant command is:
git format-patch master --stdout > your-patch-file.diff­

Generally you'll want to update your code to the latest HEAD before
creating the patch.  This will let you resolve any conflicts locally
before creating the patch, so it can be applied cleanly.

~sam goldstein


On Wed, Sep 9, 2009 at 8:16 AM, Jon Seidel <[address removed]> wrote:
> ���
> Hi... I've forked cucumber and patched a couple of bugs.�� Now I want to submit them and they (Aslak) wants a diff. Also, I�� forked[masked] and now they're now at 0.3.99.
> So....��with apologies to Lewis Carroll, I've a portmanteau question before I dive into the manuals:
> 1. I'm guessing that I should update my fork with the latest version before I pull the diff... right?
> 2. I can do a 'normal' diff on my machine, but is there a preferred way using git?
> 3. How careful do I need to be about which version the diff is against... does a git diff make that clear or is there some approach for spelling this out beyond just a note in the post?
> 4. In general, is there an accepted protocol for submitting patches? (For cucumber, they've got a lighthouse app and all submittals are through their ticketing system as opposed to direct upload as I saw was done for merb.)
> Thanks for your thoughts/suggestions­...jon
> Jon Seidel, CMC��
> EDP Consulting, Inc. / /­
> Business: That's what 'Technology' Means! - Since 1979
> --
> Please Note: If you hit "REPLY", your message will be sent to everyone on this mailing list ([address removed])
> This message was sent by Jon Seidel ([address removed]) from The East Bay Ruby Meetup Group.
> To learn more about Jon Seidel, visit his/her member profile
> To unsubscribe or to update your mailing list settings, click here
> Meetup Support: [address removed]
> 632 Broadway, New York, NY 10012 USA

Our Sponsors

People in this
Meetup are also in:

Sign up

Meetup members, Log in

By clicking "Sign up" or "Sign up using Facebook", you confirm that you accept our Terms of Service & Privacy Policy