Re: 3 way merge support in apply-reviews.py committed

2017-02-04 Thread haosdent
li...@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 > > > appl

Re: 3 way merge support in apply-reviews.py committed

2017-02-03 Thread Jie Yu
beit 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 > &g

Re: 3 way merge support in apply-reviews.py committed

2017-02-03 Thread Michael Park
t; 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 detail

3 way merge support in apply-reviews.py committed

2017-02-03 Thread Zhitao Li
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 t

Re: How to contribute to ./support/apply-reviews.py?

2016-01-12 Thread haosdent
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

Re: How to contribute to ./support/apply-reviews.py?

2016-01-12 Thread Klaus Ma
> 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 suggest

How to contribute to ./support/apply-reviews.py?

2016-01-12 Thread Klaus Ma
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

Re: How to contribute to ./support/apply-reviews.py?

2016-01-12 Thread Alex Rukletsov
//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: > > > > >

Re: How to contribute to ./support/apply-reviews.py?

2016-01-12 Thread Artem Harutyunyan
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 Sof

Re: How to contribute to ./support/apply-reviews.py?

2016-01-12 Thread Klaus Ma
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 eas

Re: apply-reviews.py

2015-10-09 Thread Artem Harutyunyan
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

Re: apply-reviews.py

2015-10-09 Thread Marco Massenzio
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 r

Re: apply-reviews.py

2015-10-09 Thread Cody Maloney
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...@mesosp

Re: apply-reviews.py

2015-10-08 Thread Adam Bordelon
. 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 m

Re: apply-reviews.py

2015-10-08 Thread Artem Harutyunyan
he 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

apply-reviews.py

2015-10-08 Thread Artem Harutyunyan
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