Re: 3 way merge support in apply-reviews.py committed
cool, thx zhitao! On Sat, Feb 4, 2017 at 6:32 AM, Jie Yu <yujie@gmail.com> wrote: > very cool! I used to do that manually. > > - Jie > > On Fri, Feb 3, 2017 at 2:10 PM, Michael Park <mp...@apache.org> wrote: > > > Thanks Zhitao for pushing this! This is awesome. > > > > Note that we made the flag opt-in so that you know to pay more attention > > when using this flag. > > Albeit rarely, it might not merge to what you want exactly. > > > > MPark > > > > On Fri, Feb 3, 2017 at 2:05 PM, Zhitao Li <zhitaoli...@gmail.com> wrote: > > > > > Hi all, > > > > > > Just a quick FYI that you can use a new "--3way" or "-3" option in > > > support/apply-reviews.py to perform a 3 way merge for patches which > don't > > > apply cleanly (see git-apply > > > <https://git-scm.com/docs/git-apply#git-apply---3way> manual for > > details). > > > > > > Special thanks to Michael Park to shepherd and committed the patch > > > <https://reviews.apache.org/r/55732/>. > > > > > > Enjoy! > > > > > > -- > > > Cheers, > > > > > > Zhitao Li > > > > > > -- Best Regards, Haosdent Huang
Re: 3 way merge support in apply-reviews.py committed
very cool! I used to do that manually. - Jie On Fri, Feb 3, 2017 at 2:10 PM, Michael Park <mp...@apache.org> wrote: > Thanks Zhitao for pushing this! This is awesome. > > Note that we made the flag opt-in so that you know to pay more attention > when using this flag. > Albeit rarely, it might not merge to what you want exactly. > > MPark > > On Fri, Feb 3, 2017 at 2:05 PM, Zhitao Li <zhitaoli...@gmail.com> wrote: > > > Hi all, > > > > Just a quick FYI that you can use a new "--3way" or "-3" option in > > support/apply-reviews.py to perform a 3 way merge for patches which don't > > apply cleanly (see git-apply > > <https://git-scm.com/docs/git-apply#git-apply---3way> manual for > details). > > > > Special thanks to Michael Park to shepherd and committed the patch > > <https://reviews.apache.org/r/55732/>. > > > > Enjoy! > > > > -- > > Cheers, > > > > Zhitao Li > > >
Re: 3 way merge support in apply-reviews.py committed
Thanks Zhitao for pushing this! This is awesome. Note that we made the flag opt-in so that you know to pay more attention when using this flag. Albeit rarely, it might not merge to what you want exactly. MPark On Fri, Feb 3, 2017 at 2:05 PM, Zhitao Li <zhitaoli...@gmail.com> wrote: > Hi all, > > Just a quick FYI that you can use a new "--3way" or "-3" option in > support/apply-reviews.py to perform a 3 way merge for patches which don't > apply cleanly (see git-apply > <https://git-scm.com/docs/git-apply#git-apply---3way> manual for details). > > Special thanks to Michael Park to shepherd and committed the patch > <https://reviews.apache.org/r/55732/>. > > Enjoy! > > -- > Cheers, > > Zhitao Li >
3 way merge support in apply-reviews.py committed
Hi all, Just a quick FYI that you can use a new "--3way" or "-3" option in support/apply-reviews.py to perform a 3 way merge for patches which don't apply cleanly (see git-apply <https://git-scm.com/docs/git-apply#git-apply---3way> manual for details). Special thanks to Michael Park to shepherd and committed the patch <https://reviews.apache.org/r/55732/>. Enjoy! -- Cheers, Zhitao Li
Re: How to contribute to ./support/apply-reviews.py?
Also through review board? https://reviews.apache.org/r/39420/ On Tue, Jan 12, 2016 at 8:42 PM, Klaus Ma <klaus1982...@gmail.com> wrote: > Hi team, > > Is there any guidance on how to contribute to apply-reviews.py? It seems I > can not post RR as usual. > I added a parameters to apply the patches quiet. So it's easy for us to > apply ~10 patches with -c. > > If any suggestion, please let me know. > > > Da (Klaus), Ma (马达) | PMP® | Advisory Software Engineer > Platform Symphony/DCOS Development & Support, STG, IBM GCG > +86-10-8245 4084 | klaus1982...@gmail.com | http://k82.me > -- Best Regards, Haosdent Huang
Re: How to contribute to ./support/apply-reviews.py?
Thanks very much. Yes, I have post a RR at https://reviews.apache.org/r/42191/, no sure what happen to the working branch that I can not post review request :). Da (Klaus), Ma (马达) | PMP® | Advisory Software Engineer Platform Symphony/DCOS Development & Support, STG, IBM GCG +86-10-8245 4084 | klaus1982...@gmail.com | http://k82.me On Tue, Jan 12, 2016 at 8:56 PM, haosdent <haosd...@gmail.com> wrote: > Also through review board? https://reviews.apache.org/r/39420/ > > On Tue, Jan 12, 2016 at 8:42 PM, Klaus Ma <klaus1982...@gmail.com> wrote: > > > Hi team, > > > > Is there any guidance on how to contribute to apply-reviews.py? It seems > I > > can not post RR as usual. > > I added a parameters to apply the patches quiet. So it's easy for us to > > apply ~10 patches with -c. > > > > If any suggestion, please let me know. > > > > > > Da (Klaus), Ma (马达) | PMP® | Advisory Software Engineer > > Platform Symphony/DCOS Development & Support, STG, IBM GCG > > +86-10-8245 4084 | klaus1982...@gmail.com | http://k82.me > > > > > > -- > Best Regards, > Haosdent Huang >
How to contribute to ./support/apply-reviews.py?
Hi team, Is there any guidance on how to contribute to apply-reviews.py? It seems I can not post RR as usual. I added a parameters to apply the patches quiet. So it's easy for us to apply ~10 patches with -c. If any suggestion, please let me know. Da (Klaus), Ma (马达) | PMP® | Advisory Software Engineer Platform Symphony/DCOS Development & Support, STG, IBM GCG +86-10-8245 4084 | klaus1982...@gmail.com | http://k82.me
Re: How to contribute to ./support/apply-reviews.py?
Sometimes RB is slightly behind the recent master. You can wait several hours and if the issue persists, share more details about it. On 12 Jan 2016 2:05 pm, "Klaus Ma" <klaus1982...@gmail.com> wrote: > Thanks very much. Yes, I have post a RR at > https://reviews.apache.org/r/42191/, no sure what happen to the working > branch that I can not post review request :). > > > Da (Klaus), Ma (马达) | PMP® | Advisory Software Engineer > Platform Symphony/DCOS Development & Support, STG, IBM GCG > +86-10-8245 4084 | klaus1982...@gmail.com | http://k82.me > > On Tue, Jan 12, 2016 at 8:56 PM, haosdent <haosd...@gmail.com> wrote: > > > Also through review board? https://reviews.apache.org/r/39420/ > > > > On Tue, Jan 12, 2016 at 8:42 PM, Klaus Ma <klaus1982...@gmail.com> > wrote: > > > > > Hi team, > > > > > > Is there any guidance on how to contribute to apply-reviews.py? It > seems > > I > > > can not post RR as usual. > > > I added a parameters to apply the patches quiet. So it's easy for us to > > > apply ~10 patches with -c. > > > > > > If any suggestion, please let me know. > > > > > > > > > Da (Klaus), Ma (马达) | PMP® | Advisory Software Engineer > > > Platform Symphony/DCOS Development & Support, STG, IBM GCG > > > +86-10-8245 4084 | klaus1982...@gmail.com | http://k82.me > > > > > > > > > > > -- > > Best Regards, > > Haosdent Huang > > >
Re: How to contribute to ./support/apply-reviews.py?
Hi Klaus, The workflow is the same (JIRA + ReviewBoard). The script, however, already seems to support what you need though (look into `-n` option). Cheers, Artem. On Tue, Jan 12, 2016 at 4:42 AM, Klaus Ma <klaus1982...@gmail.com> wrote: > Hi team, > > Is there any guidance on how to contribute to apply-reviews.py? It seems I > can not post RR as usual. > I added a parameters to apply the patches quiet. So it's easy for us to > apply ~10 patches with -c. > > If any suggestion, please let me know. > > > Da (Klaus), Ma (马达) | PMP® | Advisory Software Engineer > Platform Symphony/DCOS Development & Support, STG, IBM GCG > +86-10-8245 4084 | klaus1982...@gmail.com | http://k82.me >
Re: How to contribute to ./support/apply-reviews.py?
Hi Artem, Yes, just try `-n` option; it works for me; great to know :). Both JIRA & PR are closed. Da (Klaus), Ma (马达) | PMP® | Advisory Software Engineer Platform Symphony/DCOS Development & Support, STG, IBM GCG +86-10-8245 4084 | klaus1982...@gmail.com | http://k82.me On Wed, Jan 13, 2016 at 7:26 AM, Artem Harutyunyan <ar...@mesosphere.io> wrote: > Hi Klaus, > > The workflow is the same (JIRA + ReviewBoard). The script, however, already > seems to support what you need though (look into `-n` option). > > Cheers, > Artem. > > On Tue, Jan 12, 2016 at 4:42 AM, Klaus Ma <klaus1982...@gmail.com> wrote: > > > Hi team, > > > > Is there any guidance on how to contribute to apply-reviews.py? It seems > I > > can not post RR as usual. > > I added a parameters to apply the patches quiet. So it's easy for us to > > apply ~10 patches with -c. > > > > If any suggestion, please let me know. > > > > > > Da (Klaus), Ma (马达) | PMP® | Advisory Software Engineer > > Platform Symphony/DCOS Development & Support, STG, IBM GCG > > +86-10-8245 4084 | klaus1982...@gmail.com | http://k82.me > > >
Re: apply-reviews.py
Maybe we can think of stripping verify_reviews.py down and making it concentrate just on the verification part and call into apply-reviews.py for fetching reviews. Another alternative would be to merry the two together (like you're suggesting, and Adam mentioned it too at some point). I personally would like to keep the two separate, but I curious to see what other folks think. Cheers, Artem. On Fri, Oct 9, 2015 at 10:03 AM, Cody Maloney <c...@mesosphere.io> wrote: > Is this going to be combined with the logic to do the same thing in > https://github.com/apache/mesos/blob/master/support/verify_reviews.py which > is used for the Jenkins Mesos CI? They are doing about the same thing now > in "download a whole set of reviews in order". Be nice to just have one. > > On Thu, Oct 8, 2015 at 1:53 PM Artem Harutyunyan <ar...@mesosphere.io> > wrote: > >> Thanks, Adam! Just created >> https://issues.apache.org/jira/browse/MESOS-3625. >> >> Cheers, >> Artem. >> >> On Thu, Oct 8, 2015 at 1:25 PM, Adam Bordelon <a...@mesosphere.io> wrote: >> > Hi Artem, thanks for your work on improving the commit process. >> > >> > I have used the '-g' feature for github PRs in the past, and we should >> > continue to support that model, so that new Mesos contributors don't have >> > to create new RB accounts and learn a new process just for quick >> > documentation changes, etc. >> > >> > As a side note, now that the Myriad incubator project has migrated to >> > Apache git and we can no longer merge PRs directly, we were hoping to >> take >> > advantage of a tool like apply-reviews to apply our PR patches. It looks >> > like apply-reviews.sh only specifies 'mesos' in the GITHUB_URL/API_URL. >> > Would apply-reviews.py be just as easy to reuse for another project (i.e. >> > Myriad)? >> > >> > On Thu, Oct 8, 2015 at 11:38 AM, Artem Harutyunyan <ar...@mesosphere.io> >> > wrote: >> > >> >> Folks, >> >> >> >> The current implementation of apply-review.sh does not allow applying >> >> a chain of reviews. It has been a major inconvenience for a lot of us, >> >> so I have put together a python script that makes it possible to apply >> >> a chain of reviews (the corresponding JIRA is at [0]). The version of >> >> the script that uses apply-review.sh internally is posted at [1]. A >> >> followup review that removes that dependency is available at [2]. >> >> >> >> I would like to invite everyone to try it out and tell me what you >> >> think about it. Also, as we discussed during the last community sync, >> >> we'd like to retire apply-review.sh, so I was wondering whether anyone >> >> is still using that script with github. If so, I will go ahead and add >> >> support for '-g' in the new script. >> >> >> >> Cheers, >> >> Artem. >> >> >> >> [0] - https://issues.apache.org/jira/browse/MESOS-3468 >> >> [1] - https://reviews.apache.org/r/38705/ >> >> [2] - https://reviews.apache.org/r/38883/ >> >> >>
Re: apply-reviews.py
Depending on how sophisticated one wants to get, we could abstract away common behavior in a class and have the scripts use the functionality. You know, you can write well-designed OO code in Python too ;-) Happy to help where I can. — Sent from my iPhone, which is not as good as you'd hope to fix trypos n abbrvtn. On Fri, Oct 9, 2015 at 11:59 PM, Artem Harutyunyan <ar...@mesosphere.io> wrote: > Maybe we can think of stripping verify_reviews.py down and making it > concentrate just on the verification part and call into > apply-reviews.py for fetching reviews. Another alternative would be to > merry the two together (like you're suggesting, and Adam mentioned it > too at some point). > I personally would like to keep the two separate, but I curious to see > what other folks think. > Cheers, > Artem. > On Fri, Oct 9, 2015 at 10:03 AM, Cody Maloney <c...@mesosphere.io> wrote: >> Is this going to be combined with the logic to do the same thing in >> https://github.com/apache/mesos/blob/master/support/verify_reviews.py which >> is used for the Jenkins Mesos CI? They are doing about the same thing now >> in "download a whole set of reviews in order". Be nice to just have one. >> >> On Thu, Oct 8, 2015 at 1:53 PM Artem Harutyunyan <ar...@mesosphere.io> >> wrote: >> >>> Thanks, Adam! Just created >>> https://issues.apache.org/jira/browse/MESOS-3625. >>> >>> Cheers, >>> Artem. >>> >>> On Thu, Oct 8, 2015 at 1:25 PM, Adam Bordelon <a...@mesosphere.io> wrote: >>> > Hi Artem, thanks for your work on improving the commit process. >>> > >>> > I have used the '-g' feature for github PRs in the past, and we should >>> > continue to support that model, so that new Mesos contributors don't have >>> > to create new RB accounts and learn a new process just for quick >>> > documentation changes, etc. >>> > >>> > As a side note, now that the Myriad incubator project has migrated to >>> > Apache git and we can no longer merge PRs directly, we were hoping to >>> take >>> > advantage of a tool like apply-reviews to apply our PR patches. It looks >>> > like apply-reviews.sh only specifies 'mesos' in the GITHUB_URL/API_URL. >>> > Would apply-reviews.py be just as easy to reuse for another project (i.e. >>> > Myriad)? >>> > >>> > On Thu, Oct 8, 2015 at 11:38 AM, Artem Harutyunyan <ar...@mesosphere.io> >>> > wrote: >>> > >>> >> Folks, >>> >> >>> >> The current implementation of apply-review.sh does not allow applying >>> >> a chain of reviews. It has been a major inconvenience for a lot of us, >>> >> so I have put together a python script that makes it possible to apply >>> >> a chain of reviews (the corresponding JIRA is at [0]). The version of >>> >> the script that uses apply-review.sh internally is posted at [1]. A >>> >> followup review that removes that dependency is available at [2]. >>> >> >>> >> I would like to invite everyone to try it out and tell me what you >>> >> think about it. Also, as we discussed during the last community sync, >>> >> we'd like to retire apply-review.sh, so I was wondering whether anyone >>> >> is still using that script with github. If so, I will go ahead and add >>> >> support for '-g' in the new script. >>> >> >>> >> Cheers, >>> >> Artem. >>> >> >>> >> [0] - https://issues.apache.org/jira/browse/MESOS-3468 >>> >> [1] - https://reviews.apache.org/r/38705/ >>> >> [2] - https://reviews.apache.org/r/38883/ >>> >> >>>
Re: apply-reviews.py
Is this going to be combined with the logic to do the same thing in https://github.com/apache/mesos/blob/master/support/verify_reviews.py which is used for the Jenkins Mesos CI? They are doing about the same thing now in "download a whole set of reviews in order". Be nice to just have one. On Thu, Oct 8, 2015 at 1:53 PM Artem Harutyunyan <ar...@mesosphere.io> wrote: > Thanks, Adam! Just created > https://issues.apache.org/jira/browse/MESOS-3625. > > Cheers, > Artem. > > On Thu, Oct 8, 2015 at 1:25 PM, Adam Bordelon <a...@mesosphere.io> wrote: > > Hi Artem, thanks for your work on improving the commit process. > > > > I have used the '-g' feature for github PRs in the past, and we should > > continue to support that model, so that new Mesos contributors don't have > > to create new RB accounts and learn a new process just for quick > > documentation changes, etc. > > > > As a side note, now that the Myriad incubator project has migrated to > > Apache git and we can no longer merge PRs directly, we were hoping to > take > > advantage of a tool like apply-reviews to apply our PR patches. It looks > > like apply-reviews.sh only specifies 'mesos' in the GITHUB_URL/API_URL. > > Would apply-reviews.py be just as easy to reuse for another project (i.e. > > Myriad)? > > > > On Thu, Oct 8, 2015 at 11:38 AM, Artem Harutyunyan <ar...@mesosphere.io> > > wrote: > > > >> Folks, > >> > >> The current implementation of apply-review.sh does not allow applying > >> a chain of reviews. It has been a major inconvenience for a lot of us, > >> so I have put together a python script that makes it possible to apply > >> a chain of reviews (the corresponding JIRA is at [0]). The version of > >> the script that uses apply-review.sh internally is posted at [1]. A > >> followup review that removes that dependency is available at [2]. > >> > >> I would like to invite everyone to try it out and tell me what you > >> think about it. Also, as we discussed during the last community sync, > >> we'd like to retire apply-review.sh, so I was wondering whether anyone > >> is still using that script with github. If so, I will go ahead and add > >> support for '-g' in the new script. > >> > >> Cheers, > >> Artem. > >> > >> [0] - https://issues.apache.org/jira/browse/MESOS-3468 > >> [1] - https://reviews.apache.org/r/38705/ > >> [2] - https://reviews.apache.org/r/38883/ > >> >
Re: apply-reviews.py
Hi Artem, thanks for your work on improving the commit process. I have used the '-g' feature for github PRs in the past, and we should continue to support that model, so that new Mesos contributors don't have to create new RB accounts and learn a new process just for quick documentation changes, etc. As a side note, now that the Myriad incubator project has migrated to Apache git and we can no longer merge PRs directly, we were hoping to take advantage of a tool like apply-reviews to apply our PR patches. It looks like apply-reviews.sh only specifies 'mesos' in the GITHUB_URL/API_URL. Would apply-reviews.py be just as easy to reuse for another project (i.e. Myriad)? On Thu, Oct 8, 2015 at 11:38 AM, Artem Harutyunyan <ar...@mesosphere.io> wrote: > Folks, > > The current implementation of apply-review.sh does not allow applying > a chain of reviews. It has been a major inconvenience for a lot of us, > so I have put together a python script that makes it possible to apply > a chain of reviews (the corresponding JIRA is at [0]). The version of > the script that uses apply-review.sh internally is posted at [1]. A > followup review that removes that dependency is available at [2]. > > I would like to invite everyone to try it out and tell me what you > think about it. Also, as we discussed during the last community sync, > we'd like to retire apply-review.sh, so I was wondering whether anyone > is still using that script with github. If so, I will go ahead and add > support for '-g' in the new script. > > Cheers, > Artem. > > [0] - https://issues.apache.org/jira/browse/MESOS-3468 > [1] - https://reviews.apache.org/r/38705/ > [2] - https://reviews.apache.org/r/38883/ >
Re: apply-reviews.py
Thanks, Adam! Just created https://issues.apache.org/jira/browse/MESOS-3625. Cheers, Artem. On Thu, Oct 8, 2015 at 1:25 PM, Adam Bordelon <a...@mesosphere.io> wrote: > Hi Artem, thanks for your work on improving the commit process. > > I have used the '-g' feature for github PRs in the past, and we should > continue to support that model, so that new Mesos contributors don't have > to create new RB accounts and learn a new process just for quick > documentation changes, etc. > > As a side note, now that the Myriad incubator project has migrated to > Apache git and we can no longer merge PRs directly, we were hoping to take > advantage of a tool like apply-reviews to apply our PR patches. It looks > like apply-reviews.sh only specifies 'mesos' in the GITHUB_URL/API_URL. > Would apply-reviews.py be just as easy to reuse for another project (i.e. > Myriad)? > > On Thu, Oct 8, 2015 at 11:38 AM, Artem Harutyunyan <ar...@mesosphere.io> > wrote: > >> Folks, >> >> The current implementation of apply-review.sh does not allow applying >> a chain of reviews. It has been a major inconvenience for a lot of us, >> so I have put together a python script that makes it possible to apply >> a chain of reviews (the corresponding JIRA is at [0]). The version of >> the script that uses apply-review.sh internally is posted at [1]. A >> followup review that removes that dependency is available at [2]. >> >> I would like to invite everyone to try it out and tell me what you >> think about it. Also, as we discussed during the last community sync, >> we'd like to retire apply-review.sh, so I was wondering whether anyone >> is still using that script with github. If so, I will go ahead and add >> support for '-g' in the new script. >> >> Cheers, >> Artem. >> >> [0] - https://issues.apache.org/jira/browse/MESOS-3468 >> [1] - https://reviews.apache.org/r/38705/ >> [2] - https://reviews.apache.org/r/38883/ >>
apply-reviews.py
Folks, The current implementation of apply-review.sh does not allow applying a chain of reviews. It has been a major inconvenience for a lot of us, so I have put together a python script that makes it possible to apply a chain of reviews (the corresponding JIRA is at [0]). The version of the script that uses apply-review.sh internally is posted at [1]. A followup review that removes that dependency is available at [2]. I would like to invite everyone to try it out and tell me what you think about it. Also, as we discussed during the last community sync, we'd like to retire apply-review.sh, so I was wondering whether anyone is still using that script with github. If so, I will go ahead and add support for '-g' in the new script. Cheers, Artem. [0] - https://issues.apache.org/jira/browse/MESOS-3468 [1] - https://reviews.apache.org/r/38705/ [2] - https://reviews.apache.org/r/38883/
