mesos-reviews mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Zhitao Li <zhitaoli...@gmail.com>
Subject Review Request 55732: Added `--3way` option to `git apply`.
Date Thu, 19 Jan 2017 22:49:28 GMT

-----------------------------------------------------------
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 <jjanco.dev@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 <jjanco.dev@gmail.com>
 2 files changed, 32 insertions(+), 8 deletions(-)
 ```


Thanks,

Zhitao Li


Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message