I guess someone would have to open 3 different PRs (say, 2.2, 3.0, trunk), and the committer would have 3 different commit messages to close each of them?
Anyone have examples of projects with branching strategies similar to ours using github pull requests? On 8/29/16, 6:26 AM, "Sylvain Lebresne" <sylv...@datastax.com> wrote: >Sorry for being obtuse but what do we win exactly? > >The way we're currently working is that a lot of ticket spans 2 or more >branches so that most people currently submit patches by attaching link to >the >relevant branches (one for each version we should commit to) as well as >links >to the CI results for those branches. Unless we make serious changes to how >we >do things (but I, for one, wouldn't mind clarifications on those changes), >this doesn't seem to reduce itself well to a single pull request. > >On Mon, Aug 29, 2016 at 2:45 PM, J. D. Jordan ><https://urldefense.proofpoint.com/v2/url?u=http-3A__jeremiah.jordan-40gmail.com&d=DQIBaQ&c=08AGY6txKsvMOP6lYkHQpPMRA1U6kqhAwGa8-0QCg3M&r=yfYEBHVkX6l0zImlOIBID0gmhluYPD5Jje-3CtaT3ow&m=Y1lrf5Xrsdr1rC9ExKJpIfCHsLS2-I-Tq_G9IKGN4YU&s=RDBg4WBtc535U9iJBWBSIw9OJItd2ZcsL3Kqpzh6Xk8&e= > > >wrote: > >> I think it goes the other way around. When you push to ASF git with the >> right commit message then the integration from that side closes the pull >> request. >> >> > On Aug 28, 2016, at 11:48 PM, Jonathan Ellis <jbel...@gmail.com> wrote: >> > >> > Don't we need something on the infra side to turn a merged pull request >> > into a commit to the ASF repo? >> > >> > On Sun, Aug 28, 2016 at 11:07 PM, Nate McCall <n...@thelastpickle.com> >> > wrote: >> > >> >>> >> >>> >> >>> Infra is exploring options for giving PMCs greater control over GitHub >> >>> config (including allowing GitHub to be the master with a golden copy >> >>> held at the ASF) but that is a work in progress. >> >> ^ Per Mark's comment, there is not anything we can really do past what >> >> Jake F. described with Thrift. We dealt with this with Usergrid back in >> >> incubation two years ago (Jake F. actually helped us get it all sorted >> at >> >> the time) when we were using >> >> https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_usergrid_usergrid&d=DQIBaQ&c=08AGY6txKsvMOP6lYkHQpPMRA1U6kqhAwGa8-0QCg3M&r=yfYEBHVkX6l0zImlOIBID0gmhluYPD5Jje-3CtaT3ow&m=Y1lrf5Xrsdr1rC9ExKJpIfCHsLS2-I-Tq_G9IKGN4YU&s=QJDmpc1jGzcYxAuVgRITwhtE0pvI9cX89qzs4PYGOEw&e= >> >> as >> the >> >> source: >> >> https://urldefense.proofpoint.com/v2/url?u=http-3A__mail-2Darchives.apache.org_mod-5Fmbox_usergrid-2Ddev_201405.mbox_-25&d=DQIBaQ&c=08AGY6txKsvMOP6lYkHQpPMRA1U6kqhAwGa8-0QCg3M&r=yfYEBHVkX6l0zImlOIBID0gmhluYPD5Jje-3CtaT3ow&m=Y1lrf5Xrsdr1rC9ExKJpIfCHsLS2-I-Tq_G9IKGN4YU&s=7kzsf7Cftf3JLs6mxfG9K977BOT4UsPhrNrF0AUNMxE&e= >> >> >> >> 3CCANyrgvdTVzZQD7w3C96LUHa=h7-h4qmu4h7ajsxoat0gd0f...@mail.gmail.com%3E >> >> >> >> Here is the Thrift guide again for reference: >> >> https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_apache_thrift_blob_master_&d=DQIBaQ&c=08AGY6txKsvMOP6lYkHQpPMRA1U6kqhAwGa8-0QCg3M&r=yfYEBHVkX6l0zImlOIBID0gmhluYPD5Jje-3CtaT3ow&m=Y1lrf5Xrsdr1rC9ExKJpIfCHsLS2-I-Tq_G9IKGN4YU&s=jWroE0rW19cTgXQevrVclo_vrOVZPm3ayttaIDlLsmY&e= >> >> >> CONTRIBUTING.md#contributing- >> >> via-github-pull-requests >> >> >> >> JClouds also has a nice write up/how-to (we based Usergrid on this, >> >> initially): >> >> https://urldefense.proofpoint.com/v2/url?u=https-3A__cwiki.apache.org_confluence_display_JCLOUDS_Git-2Bworkflow&d=DQIBaQ&c=08AGY6txKsvMOP6lYkHQpPMRA1U6kqhAwGa8-0QCg3M&r=yfYEBHVkX6l0zImlOIBID0gmhluYPD5Jje-3CtaT3ow&m=Y1lrf5Xrsdr1rC9ExKJpIfCHsLS2-I-Tq_G9IKGN4YU&s=myPol_9DxHRsfH9Qu4wumwGS85iQMim1H6adNG5q0Nw&e= >> >> >> >> >> >> Maybe we just amend our 'how-to-commit' with similar details as the two >> >> references above? >> >> https://urldefense.proofpoint.com/v2/url?u=http-3A__cassandra.apache.org_doc_latest_development_how-5Fto-5Fcommit.html&d=DQIBaQ&c=08AGY6txKsvMOP6lYkHQpPMRA1U6kqhAwGa8-0QCg3M&r=yfYEBHVkX6l0zImlOIBID0gmhluYPD5Jje-3CtaT3ow&m=Y1lrf5Xrsdr1rC9ExKJpIfCHsLS2-I-Tq_G9IKGN4YU&s=4uaZpa4HwH5Zmy1kcnup2pF7IVDFSNugBV7oKrDNFqA&e= >> >> >> >> >> >> -Nate >> >> >> >> On Mon, Aug 29, 2016 at 10:44 AM, Nate McCall <n...@thelastpickle.com> >> >> wrote: >> >> >> >>> >> >>>> Nate, since you have experience with this from Usergrid, can you >> figure >> >>>> out >> >>>> what we need to do to make this happen and follow up with infra? >> >>> >> >>> Yep - i'll look into this. >> > >> > >> > >> > -- >> > Jonathan Ellis >> > Project Chair, Apache Cassandra >> > co-founder, >> > https://urldefense.proofpoint.com/v2/url?u=http-3A__www.datastax.com&d=DQIBaQ&c=08AGY6txKsvMOP6lYkHQpPMRA1U6kqhAwGa8-0QCg3M&r=yfYEBHVkX6l0zImlOIBID0gmhluYPD5Jje-3CtaT3ow&m=Y1lrf5Xrsdr1rC9ExKJpIfCHsLS2-I-Tq_G9IKGN4YU&s=X4Ry4_CijxQv9T0pV128swtLPYwyImU73IBOUAzfGig&e= >> > >> > @spyced >>
smime.p7s
Description: S/MIME cryptographic signature
