You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@mesos.apache.org by Zhitao Li <zh...@gmail.com> on 2017/01/19 22:49:28 UTC
Review Request 55732: Added `--3way` option to `git apply`.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/
-----------------------------------------------------------
Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
Bugs: MESOS-4119
https://issues.apache.org/jira/browse/MESOS-4119
Repository: mesos
Description
-------
This can help on some patches which includes conflicts that can be
resolved by 3 way merge.
Diffs
-----
support/apply-reviews.py c77b4c2b2d7a3d5e74e225403e71a84e23a9a1e7
Diff: https://reviews.apache.org/r/55732/diff/
Testing
-------
With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
Bash log:
```
$ python ./support/apply-reviews.py -r 52534 -c
2017-01-19 14:45:26 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
[3way fba53e2] Track allocation candidates to bound allocator.
Author: Jacob Janco <jj...@gmail.com>
2 files changed, 97 insertions(+), 54 deletions(-)
2017-01-19 14:45:28 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
Falling back to three-way merge...
Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
[3way 261018a] Dispatch filter expiration twice.
Author: Jacob Janco <jj...@gmail.com>
2 files changed, 32 insertions(+), 8 deletions(-)
```
Thanks,
Zhitao Li
Re: Review Request 55732: Added `--3way` option to `git apply`.
Posted by Mesos Reviewbot <re...@mesos.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/#review162383
-----------------------------------------------------------
Patch looks great!
Reviews applied: [55732]
Passed command: export OS='ubuntu:14.04' BUILDTOOL='autotools' COMPILER='gcc' CONFIGURATION='--verbose' ENVIRONMENT='GLOG_v=1 MESOS_VERBOSE=1'; ./support/docker-build.sh
- Mesos Reviewbot
On Jan. 19, 2017, 10:49 p.m., Zhitao Li wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/55732/
> -----------------------------------------------------------
>
> (Updated Jan. 19, 2017, 10:49 p.m.)
>
>
> Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
>
>
> Bugs: MESOS-4119
> https://issues.apache.org/jira/browse/MESOS-4119
>
>
> Repository: mesos
>
>
> Description
> -------
>
> This can help on some patches which includes conflicts that can be
> resolved by 3 way merge.
>
>
> Diffs
> -----
>
> support/apply-reviews.py c77b4c2b2d7a3d5e74e225403e71a84e23a9a1e7
>
> Diff: https://reviews.apache.org/r/55732/diff/
>
>
> Testing
> -------
>
> With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
>
> Bash log:
> ```
> $ python ./support/apply-reviews.py -r 52534 -c
> 2017-01-19 14:45:26 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
> [3way fba53e2] Track allocation candidates to bound allocator.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 97 insertions(+), 54 deletions(-)
> 2017-01-19 14:45:28 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
> error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
> Falling back to three-way merge...
> Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
> [3way 261018a] Dispatch filter expiration twice.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 32 insertions(+), 8 deletions(-)
> ```
>
>
> Thanks,
>
> Zhitao Li
>
>
Re: Review Request 55732: Added `--3way` option to `git apply`.
Posted by Michael Park <mp...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/#review162522
-----------------------------------------------------------
support/apply-reviews.py (line 184)
<https://reviews.apache.org/r/55732/#comment233832>
We don't want to always perform `--3way`. We want to use the strict apply semantics by default but be able to opt in for 3way semantics so that we can be aware and more conscious about it. I'd like to see the `--3way` be an option for `apply-reviews.py`.
- Michael Park
On Jan. 19, 2017, 2:49 p.m., Zhitao Li wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/55732/
> -----------------------------------------------------------
>
> (Updated Jan. 19, 2017, 2:49 p.m.)
>
>
> Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
>
>
> Bugs: MESOS-4119
> https://issues.apache.org/jira/browse/MESOS-4119
>
>
> Repository: mesos
>
>
> Description
> -------
>
> This can help on some patches which includes conflicts that can be
> resolved by 3 way merge.
>
>
> Diffs
> -----
>
> support/apply-reviews.py c77b4c2b2d7a3d5e74e225403e71a84e23a9a1e7
>
> Diff: https://reviews.apache.org/r/55732/diff/
>
>
> Testing
> -------
>
> With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
>
> Bash log:
> ```
> $ python ./support/apply-reviews.py -r 52534 -c
> 2017-01-19 14:45:26 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
> [3way fba53e2] Track allocation candidates to bound allocator.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 97 insertions(+), 54 deletions(-)
> 2017-01-19 14:45:28 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
> error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
> Falling back to three-way merge...
> Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
> [3way 261018a] Dispatch filter expiration twice.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 32 insertions(+), 8 deletions(-)
> ```
>
>
> Thanks,
>
> Zhitao Li
>
>
Re: Review Request 55732: Added `--3way` option to apply-reviews.py.
Posted by haosdent huang <ha...@apache.org>.
> On Jan. 20, 2017, 6:24 a.m., haosdent huang wrote:
> > support/apply-reviews.py, lines 120-121
> > <https://reviews.apache.org/r/55732/diff/1/?file=1609817#file1609817line120>
> >
> > Is this change necessary?
>
> Zhitao Li wrote:
> From what I observed, in `--3way` mode, git apply seems to drop the `.patch` file by itself, so this line would error out becasue the file does not exist.
>
> Given that the goal here is to ensure the file is deleted, I think the change is okay.
should use `os.path.exist`?
- haosdent
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/#review162389
-----------------------------------------------------------
On Jan. 23, 2017, 6:02 p.m., Zhitao Li wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/55732/
> -----------------------------------------------------------
>
> (Updated Jan. 23, 2017, 6:02 p.m.)
>
>
> Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
>
>
> Bugs: MESOS-4119
> https://issues.apache.org/jira/browse/MESOS-4119
>
>
> Repository: mesos
>
>
> Description
> -------
>
> This can help on some patches which includes conflicts that can be
> resolved by 3 way merge.
>
>
> Diffs
> -----
>
> support/apply-reviews.py c77b4c2b2d7a3d5e74e225403e71a84e23a9a1e7
>
> Diff: https://reviews.apache.org/r/55732/diff/
>
>
> Testing
> -------
>
> With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
>
> Bash log:
> ```
>
> $ python ./support/apply-reviews.py -r 52534 -c --3way
> 2017-01-23 10:00:57 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
> [3way 93791b1] Track allocation candidates to bound allocator.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 97 insertions(+), 54 deletions(-)
> 2017-01-23 10:00:59 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
> error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
> Falling back to three-way merge...
> Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
> [3way 6f24fe7] Dispatch filter expiration twice.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 32 insertions(+), 8 deletions(-)
> ```
>
>
> Thanks,
>
> Zhitao Li
>
>
Re: Review Request 55732: Added `--3way` option to `git apply`.
Posted by Zhitao Li <zh...@gmail.com>.
> On Jan. 20, 2017, 6:24 a.m., haosdent huang wrote:
> > support/apply-reviews.py, lines 120-121
> > <https://reviews.apache.org/r/55732/diff/1/?file=1609817#file1609817line120>
> >
> > Is this change necessary?
From what I observed, in `--3way` mode, git apply seems to drop the `.patch` file by itself, so this line would error out becasue the file does not exist.
Given that the goal here is to ensure the file is deleted, I think the change is okay.
- Zhitao
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/#review162389
-----------------------------------------------------------
On Jan. 19, 2017, 10:49 p.m., Zhitao Li wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/55732/
> -----------------------------------------------------------
>
> (Updated Jan. 19, 2017, 10:49 p.m.)
>
>
> Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
>
>
> Bugs: MESOS-4119
> https://issues.apache.org/jira/browse/MESOS-4119
>
>
> Repository: mesos
>
>
> Description
> -------
>
> This can help on some patches which includes conflicts that can be
> resolved by 3 way merge.
>
>
> Diffs
> -----
>
> support/apply-reviews.py c77b4c2b2d7a3d5e74e225403e71a84e23a9a1e7
>
> Diff: https://reviews.apache.org/r/55732/diff/
>
>
> Testing
> -------
>
> With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
>
> Bash log:
> ```
> $ python ./support/apply-reviews.py -r 52534 -c
> 2017-01-19 14:45:26 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
> [3way fba53e2] Track allocation candidates to bound allocator.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 97 insertions(+), 54 deletions(-)
> 2017-01-19 14:45:28 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
> error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
> Falling back to three-way merge...
> Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
> [3way 261018a] Dispatch filter expiration twice.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 32 insertions(+), 8 deletions(-)
> ```
>
>
> Thanks,
>
> Zhitao Li
>
>
Re: Review Request 55732: Added `--3way` option to `git apply`.
Posted by haosdent huang <ha...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/#review162389
-----------------------------------------------------------
support/apply-reviews.py (lines 120 - 121)
<https://reviews.apache.org/r/55732/#comment233740>
Is this change necessary?
- haosdent huang
On Jan. 19, 2017, 10:49 p.m., Zhitao Li wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/55732/
> -----------------------------------------------------------
>
> (Updated Jan. 19, 2017, 10:49 p.m.)
>
>
> Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
>
>
> Bugs: MESOS-4119
> https://issues.apache.org/jira/browse/MESOS-4119
>
>
> Repository: mesos
>
>
> Description
> -------
>
> This can help on some patches which includes conflicts that can be
> resolved by 3 way merge.
>
>
> Diffs
> -----
>
> support/apply-reviews.py c77b4c2b2d7a3d5e74e225403e71a84e23a9a1e7
>
> Diff: https://reviews.apache.org/r/55732/diff/
>
>
> Testing
> -------
>
> With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
>
> Bash log:
> ```
> $ python ./support/apply-reviews.py -r 52534 -c
> 2017-01-19 14:45:26 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
> [3way fba53e2] Track allocation candidates to bound allocator.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 97 insertions(+), 54 deletions(-)
> 2017-01-19 14:45:28 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
> error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
> Falling back to three-way merge...
> Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
> [3way 261018a] Dispatch filter expiration twice.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 32 insertions(+), 8 deletions(-)
> ```
>
>
> Thanks,
>
> Zhitao Li
>
>
Re: Review Request 55732: Added `--3way` option to apply-reviews.py.
Posted by Mesos Reviewbot <re...@mesos.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/#review162717
-----------------------------------------------------------
Patch looks great!
Reviews applied: [55732]
Passed command: export OS='ubuntu:14.04' BUILDTOOL='autotools' COMPILER='gcc' CONFIGURATION='--verbose' ENVIRONMENT='GLOG_v=1 MESOS_VERBOSE=1'; ./support/docker-build.sh
- Mesos Reviewbot
On Jan. 23, 2017, 6:02 p.m., Zhitao Li wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/55732/
> -----------------------------------------------------------
>
> (Updated Jan. 23, 2017, 6:02 p.m.)
>
>
> Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
>
>
> Bugs: MESOS-4119
> https://issues.apache.org/jira/browse/MESOS-4119
>
>
> Repository: mesos
>
>
> Description
> -------
>
> This can help on some patches which includes conflicts that can be
> resolved by 3 way merge.
>
>
> Diffs
> -----
>
> support/apply-reviews.py c77b4c2b2d7a3d5e74e225403e71a84e23a9a1e7
>
> Diff: https://reviews.apache.org/r/55732/diff/
>
>
> Testing
> -------
>
> With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
>
> Bash log:
> ```
>
> $ python ./support/apply-reviews.py -r 52534 -c --3way
> 2017-01-23 10:00:57 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
> [3way 93791b1] Track allocation candidates to bound allocator.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 97 insertions(+), 54 deletions(-)
> 2017-01-23 10:00:59 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
> error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
> Falling back to three-way merge...
> Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
> [3way 6f24fe7] Dispatch filter expiration twice.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 32 insertions(+), 8 deletions(-)
> ```
>
>
> Thanks,
>
> Zhitao Li
>
>
Re: Review Request 55732: Added `--3way` option to apply-reviews.py.
Posted by Zhitao Li <zh...@gmail.com>.
> On Feb. 2, 2017, 10:26 p.m., Michael Park wrote:
> > support/apply-reviews.py, line 123
> > <https://reviews.apache.org/r/55732/diff/3/?file=1621559#file1621559line123>
> >
> > Is there something related to this patch that makes it not exist sometimes?
From my testing, `git apply --3way` could remove the patch file when resolving the conflict? I encounted some error complaining patch file non existing, so I added this precondition.
- Zhitao
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/#review164032
-----------------------------------------------------------
On Feb. 1, 2017, 6:45 p.m., Zhitao Li wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/55732/
> -----------------------------------------------------------
>
> (Updated Feb. 1, 2017, 6:45 p.m.)
>
>
> Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
>
>
> Bugs: MESOS-4119
> https://issues.apache.org/jira/browse/MESOS-4119
>
>
> Repository: mesos
>
>
> Description
> -------
>
> This can help on some patches which includes conflicts that can be
> resolved by 3 way merge.
>
>
> Diffs
> -----
>
> support/apply-reviews.py cdfdd58f9310f95b075c025048b6523fc1a4da65
>
> Diff: https://reviews.apache.org/r/55732/diff/
>
>
> Testing
> -------
>
> With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
>
> Bash log:
> ```
>
> $ python ./support/apply-reviews.py -r 52534 -c --3way
> 2017-01-23 10:00:57 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
> [3way 93791b1] Track allocation candidates to bound allocator.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 97 insertions(+), 54 deletions(-)
> 2017-01-23 10:00:59 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
> error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
> Falling back to three-way merge...
> Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
> [3way 6f24fe7] Dispatch filter expiration twice.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 32 insertions(+), 8 deletions(-)
> ```
>
>
> Thanks,
>
> Zhitao Li
>
>
Re: Review Request 55732: Added `--3way` option to apply-reviews.py.
Posted by Michael Park <mp...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/#review164032
-----------------------------------------------------------
Fix it, then Ship it!
support/apply-reviews.py (line 7)
<https://reviews.apache.org/r/55732/#comment235563>
I don't think this is necessary right? We already import `os`.
support/apply-reviews.py (line 123)
<https://reviews.apache.org/r/55732/#comment235559>
Is there something related to this patch that makes it not exist sometimes?
support/apply-reviews.py (line 326)
<https://reviews.apache.org/r/55732/#comment235560>
Let's add the `-3` short option as well.
- Michael Park
On Feb. 1, 2017, 10:45 a.m., Zhitao Li wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/55732/
> -----------------------------------------------------------
>
> (Updated Feb. 1, 2017, 10:45 a.m.)
>
>
> Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
>
>
> Bugs: MESOS-4119
> https://issues.apache.org/jira/browse/MESOS-4119
>
>
> Repository: mesos
>
>
> Description
> -------
>
> This can help on some patches which includes conflicts that can be
> resolved by 3 way merge.
>
>
> Diffs
> -----
>
> support/apply-reviews.py cdfdd58f9310f95b075c025048b6523fc1a4da65
>
> Diff: https://reviews.apache.org/r/55732/diff/
>
>
> Testing
> -------
>
> With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
>
> Bash log:
> ```
>
> $ python ./support/apply-reviews.py -r 52534 -c --3way
> 2017-01-23 10:00:57 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
> [3way 93791b1] Track allocation candidates to bound allocator.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 97 insertions(+), 54 deletions(-)
> 2017-01-23 10:00:59 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
> error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
> Falling back to three-way merge...
> Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
> [3way 6f24fe7] Dispatch filter expiration twice.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 32 insertions(+), 8 deletions(-)
> ```
>
>
> Thanks,
>
> Zhitao Li
>
>
Re: Review Request 55732: Added `--3way` option to apply-reviews.py.
Posted by Mesos Reviewbot <re...@mesos.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/#review163872
-----------------------------------------------------------
Patch looks great!
Reviews applied: [55732]
Passed command: export OS='ubuntu:14.04' BUILDTOOL='autotools' COMPILER='gcc' CONFIGURATION='--verbose' ENVIRONMENT='GLOG_v=1 MESOS_VERBOSE=1'; ./support/docker-build.sh
- Mesos Reviewbot
On Feb. 1, 2017, 6:45 p.m., Zhitao Li wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/55732/
> -----------------------------------------------------------
>
> (Updated Feb. 1, 2017, 6:45 p.m.)
>
>
> Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
>
>
> Bugs: MESOS-4119
> https://issues.apache.org/jira/browse/MESOS-4119
>
>
> Repository: mesos
>
>
> Description
> -------
>
> This can help on some patches which includes conflicts that can be
> resolved by 3 way merge.
>
>
> Diffs
> -----
>
> support/apply-reviews.py cdfdd58f9310f95b075c025048b6523fc1a4da65
>
> Diff: https://reviews.apache.org/r/55732/diff/
>
>
> Testing
> -------
>
> With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
>
> Bash log:
> ```
>
> $ python ./support/apply-reviews.py -r 52534 -c --3way
> 2017-01-23 10:00:57 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
> [3way 93791b1] Track allocation candidates to bound allocator.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 97 insertions(+), 54 deletions(-)
> 2017-01-23 10:00:59 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
> error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
> Falling back to three-way merge...
> Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
> [3way 6f24fe7] Dispatch filter expiration twice.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 32 insertions(+), 8 deletions(-)
> ```
>
>
> Thanks,
>
> Zhitao Li
>
>
Re: Review Request 55732: Added `--3way` option to apply-reviews.py.
Posted by Jiang Yan Xu <xu...@apple.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/#review164141
-----------------------------------------------------------
Ship it!
Ship It!
- Jiang Yan Xu
On Feb. 3, 2017, 10:07 a.m., Zhitao Li wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/55732/
> -----------------------------------------------------------
>
> (Updated Feb. 3, 2017, 10:07 a.m.)
>
>
> Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
>
>
> Bugs: MESOS-4119
> https://issues.apache.org/jira/browse/MESOS-4119
>
>
> Repository: mesos
>
>
> Description
> -------
>
> This can help on some patches which includes conflicts that can be
> resolved by 3 way merge.
>
>
> Diffs
> -----
>
> support/apply-reviews.py cdfdd58f9310f95b075c025048b6523fc1a4da65
>
> Diff: https://reviews.apache.org/r/55732/diff/
>
>
> Testing
> -------
>
> With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
>
> Bash log:
> ```
>
> $ python ./support/apply-reviews.py -r 52534 -c --3way
> 2017-01-23 10:00:57 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
> [3way 93791b1] Track allocation candidates to bound allocator.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 97 insertions(+), 54 deletions(-)
> 2017-01-23 10:00:59 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
> error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
> Falling back to three-way merge...
> Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
> [3way 6f24fe7] Dispatch filter expiration twice.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 32 insertions(+), 8 deletions(-)
> ```
>
>
> Thanks,
>
> Zhitao Li
>
>
Re: Review Request 55732: Added `--3way` option to apply-reviews.py.
Posted by Zhitao Li <zh...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/
-----------------------------------------------------------
(Updated Feb. 3, 2017, 6:07 p.m.)
Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
Changes
-------
Review comments.
Bugs: MESOS-4119
https://issues.apache.org/jira/browse/MESOS-4119
Repository: mesos
Description
-------
This can help on some patches which includes conflicts that can be
resolved by 3 way merge.
Diffs (updated)
-----
support/apply-reviews.py cdfdd58f9310f95b075c025048b6523fc1a4da65
Diff: https://reviews.apache.org/r/55732/diff/
Testing
-------
With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
Bash log:
```
$ python ./support/apply-reviews.py -r 52534 -c --3way
2017-01-23 10:00:57 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
[3way 93791b1] Track allocation candidates to bound allocator.
Author: Jacob Janco <jj...@gmail.com>
2 files changed, 97 insertions(+), 54 deletions(-)
2017-01-23 10:00:59 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
Falling back to three-way merge...
Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
[3way 6f24fe7] Dispatch filter expiration twice.
Author: Jacob Janco <jj...@gmail.com>
2 files changed, 32 insertions(+), 8 deletions(-)
```
Thanks,
Zhitao Li
Re: Review Request 55732: Added `--3way` option to apply-reviews.py.
Posted by Zhitao Li <zh...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/
-----------------------------------------------------------
(Updated Feb. 1, 2017, 6:45 p.m.)
Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
Changes
-------
Rebase and @haosdent's comment.
Bugs: MESOS-4119
https://issues.apache.org/jira/browse/MESOS-4119
Repository: mesos
Description
-------
This can help on some patches which includes conflicts that can be
resolved by 3 way merge.
Diffs (updated)
-----
support/apply-reviews.py cdfdd58f9310f95b075c025048b6523fc1a4da65
Diff: https://reviews.apache.org/r/55732/diff/
Testing
-------
With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
Bash log:
```
$ python ./support/apply-reviews.py -r 52534 -c --3way
2017-01-23 10:00:57 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
[3way 93791b1] Track allocation candidates to bound allocator.
Author: Jacob Janco <jj...@gmail.com>
2 files changed, 97 insertions(+), 54 deletions(-)
2017-01-23 10:00:59 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
Falling back to three-way merge...
Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
[3way 6f24fe7] Dispatch filter expiration twice.
Author: Jacob Janco <jj...@gmail.com>
2 files changed, 32 insertions(+), 8 deletions(-)
```
Thanks,
Zhitao Li
Re: Review Request 55732: Added `--3way` option to apply-reviews.py.
Posted by haosdent huang <ha...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/#review163089
-----------------------------------------------------------
Fix it, then Ship it!
Ship It!
support/apply-reviews.py (line 121)
<https://reviews.apache.org/r/55732/#comment234532>
```
atexit.register(lambda: os.path.exists(patch_file) and os.remove(patch_file))
```
- haosdent huang
On Jan. 23, 2017, 6:02 p.m., Zhitao Li wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/55732/
> -----------------------------------------------------------
>
> (Updated Jan. 23, 2017, 6:02 p.m.)
>
>
> Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
>
>
> Bugs: MESOS-4119
> https://issues.apache.org/jira/browse/MESOS-4119
>
>
> Repository: mesos
>
>
> Description
> -------
>
> This can help on some patches which includes conflicts that can be
> resolved by 3 way merge.
>
>
> Diffs
> -----
>
> support/apply-reviews.py c77b4c2b2d7a3d5e74e225403e71a84e23a9a1e7
>
> Diff: https://reviews.apache.org/r/55732/diff/
>
>
> Testing
> -------
>
> With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
>
> Bash log:
> ```
>
> $ python ./support/apply-reviews.py -r 52534 -c --3way
> 2017-01-23 10:00:57 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
> [3way 93791b1] Track allocation candidates to bound allocator.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 97 insertions(+), 54 deletions(-)
> 2017-01-23 10:00:59 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
> error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
> Falling back to three-way merge...
> Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
> [3way 6f24fe7] Dispatch filter expiration twice.
> Author: Jacob Janco <jj...@gmail.com>
> 2 files changed, 32 insertions(+), 8 deletions(-)
> ```
>
>
> Thanks,
>
> Zhitao Li
>
>
Re: Review Request 55732: Added `--3way` option to apply-reviews.py.
Posted by Zhitao Li <zh...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/
-----------------------------------------------------------
(Updated Jan. 23, 2017, 6:02 p.m.)
Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
Changes
-------
Add `--3ways` option to script itself to make it opt-in.
Summary (updated)
-----------------
Added `--3way` option to apply-reviews.py.
Bugs: MESOS-4119
https://issues.apache.org/jira/browse/MESOS-4119
Repository: mesos
Description
-------
This can help on some patches which includes conflicts that can be
resolved by 3 way merge.
Diffs (updated)
-----
support/apply-reviews.py c77b4c2b2d7a3d5e74e225403e71a84e23a9a1e7
Diff: https://reviews.apache.org/r/55732/diff/
Testing (updated)
-------
With this fix, I was able to apply the chain in r/52534, which has a conflict otherwise.
Bash log:
```
$ python ./support/apply-reviews.py -r 52534 -c --3way
2017-01-23 10:00:57 URL:https://reviews.apache.org/r/51027/diff/raw/ [9830/9830] -> "51027.patch" [1]
[3way 93791b1] Track allocation candidates to bound allocator.
Author: Jacob Janco <jj...@gmail.com>
2 files changed, 97 insertions(+), 54 deletions(-)
2017-01-23 10:00:59 URL:https://reviews.apache.org/r/52534/diff/raw/ [2950/2950] -> "52534.patch" [1]
error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
Falling back to three-way merge...
Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
[3way 6f24fe7] Dispatch filter expiration twice.
Author: Jacob Janco <jj...@gmail.com>
2 files changed, 32 insertions(+), 8 deletions(-)
```
Thanks,
Zhitao Li