wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
foundationdb/contrib
History
Xiaoge Su 056a670b63 Pull request cherry-pick helper 
This is a modified version of old cherry-pick-upstream.py which supports
continuing a pull request merge which failed by a conflict.

Usage:

    prx.py merge [PR ID]

This will merge a pull request with an ID, e.g. 10460 or so. The merge
will stop when a cherry-pick fails with conflict, and the state will be
stored. The user should manually fix the conflict, commit the chagnes
and use prx.py continue to continue the process.

The merge command will fail if a current prx.py merge is undergoing.

NOTE: This merge will have its own internal state, and is different from
the standard git merge.

    prx.py abort

Abort the current merge.

    prx.py continue

Continue the current merge, assuming the conflicting commit is resolved
and can be skipped.

    prx.py status

Report the current status of merge.
 		2023-07-24 18:43:07 -07:00
..
Implib.so Fix UBSAN build for C shim library (#9311) 2023-02-07 20:17:07 +01:00
Joshua fixup! Additional fixes 2023-03-22 15:15:53 -07:00
SimpleOpt Flow compiling 2022-06-27 17:05:55 -06:00
TestHarness Merge remote-tracking branch 'origin' into env 2022-08-24 13:06:47 -04:00
TestHarness2 fixup! Fix various issues in test_harness 2023-06-12 11:42:08 -07:00
TraceLogHelper Surfacing non-fatal parse errors in Test Harness output 2021-05-19 20:04:12 +00:00
boost_zstd fixup! Reformat zstd.cpp 2022-10-05 12:52:39 -07:00
crc32 Introduce initial Swift support in fdbserver (#10156) 2023-06-02 16:09:28 -05:00
debug_determinism Flush all output streams in flushAndExit 2022-03-07 13:25:52 -08:00
fdbcstat fdbcstat: FDB C API monitoring utility 2020-07-31 18:34:51 -07:00
fmt-8.1.1 Fix clang format and cmake files for fmt 8.1.1 2022-03-04 15:52:06 -08:00
folly_memcpy Flow compiling 2022-06-27 17:05:55 -06:00
grv_proxy_model Apply black format to most Python files, excluding a few cases where we have Python 2 files and a few files written externally. Add external files as exclusions to the precommit checks. 2023-04-28 11:46:41 -07:00
libb64 Fix the computation of the maximum array bound for the decoding array 2022-09-21 14:29:36 -07:00
linenoise fdbcli compiling 2022-06-27 19:20:18 -06:00
local_cluster fixup! Set up fdbcli path when running a local cluster 2023-07-11 13:13:39 -07:00
md5 Remove WolfSSL support in FoundationDB 2023-03-23 20:17:18 -07:00
mockkms Fix mockkms build with disabled go 2023-02-28 09:00:36 -07:00
monitoring Apply black format to most Python files, excluding a few cases where we have Python 2 files and a few files written externally. Add external files as exclusions to the precommit checks. 2023-04-28 11:46:41 -07:00
observability_splunk_dashboard add splunk dashboards (#7942) 2022-08-19 20:05:37 -04:00
pkg_tester Fix /etc/foundationdb/ rpm ownership 2023-01-06 16:30:18 -08:00
rapidjson/rapidjson Authz JWT support (#7279) 2022-06-02 13:22:50 +02:00
rapidxml move rapidxml to its own target 2022-06-29 16:10:14 -06:00
serialize-check Fix several issues found by flake8. Ignore E402, which detects when we have import statements not at the top of the file, since we have many files that use this pattern and are not easy to fix. 2023-05-02 10:06:40 -07:00
sqlite format source code after switch to clang 15 2022-12-08 17:26:45 +00:00
stacktrace Flow compiling 2022-06-27 17:05:55 -06:00
transaction_profiling_analyzer Add 7.3 protocol version to transaction_profiling_analyzer.py 2023-06-27 10:19:10 -07:00
CMakeLists.txt Remove mockkms dir from the build dir (#10650) 2023-07-20 16:14:29 -05:00
alloc_instrumentation.py Apply black format to most Python files, excluding a few cases where we have Python 2 files and a few files written externally. Add external files as exclusions to the precommit checks. 2023-04-28 11:46:41 -07:00
alloc_instrumentation_traces.py Apply black format to most Python files, excluding a few cases where we have Python 2 files and a few files written externally. Add external files as exclusions to the precommit checks. 2023-04-28 11:46:41 -07:00
apiversioner.py Fix several issues found by flake8. Ignore E402, which detects when we have import statements not at the top of the file, since we have many files that use this pattern and are not easy to fix. 2023-05-02 10:06:40 -07:00
branch_diff.py Tool that diffs two branches, e.g. 7.2.0 .. release-7.3 2023-05-26 16:48:36 -07:00
commit_debug.py Fix several issues found by flake8. Ignore E402, which detects when we have import statements not at the top of the file, since we have many files that use this pattern and are not easy to fix. 2023-05-02 10:06:40 -07:00
ctest_to_joshua.py Update ctest_to_joshua to work with new ctests (#7584) 2022-07-14 18:34:48 +02:00
ddsketch_calc.py Apply black format to most Python files, excluding a few cases where we have Python 2 files and a few files written externally. Add external files as exclusions to the precommit checks. 2023-04-28 11:46:41 -07:00
ddsketch_compare.py Apply black format to most Python files, excluding a few cases where we have Python 2 files and a few files written externally. Add external files as exclusions to the precommit checks. 2023-04-28 11:46:41 -07:00
ddsketch_conversion.py Apply black format to most Python files, excluding a few cases where we have Python 2 files and a few files written externally. Add external files as exclusions to the precommit checks. 2023-04-28 11:46:41 -07:00
export_graph.py Apply black format to most Python files, excluding a few cases where we have Python 2 files and a few files written externally. Add external files as exclusions to the precommit checks. 2023-04-28 11:46:41 -07:00
gen_compile_db.py Introduce initial Swift support in fdbserver (#10156) 2023-06-02 16:09:28 -05:00
generate_profile.sh Add a target to generate profile (#6396) 2022-02-28 17:00:30 -06:00
joshua_logtool.py Fix joshua_logtool.py to allow . in ensemble ID 2023-06-27 15:09:47 -07:00
lint.py Fix several issues found by flake8. Ignore E402, which detects when we have import statements not at the top of the file, since we have many files that use this pattern and are not easy to fix. 2023-05-02 10:06:40 -07:00
lsan.suppressions Suppress LSAN leak reports from ConnectionReaderActorState (#8889) 2022-11-21 17:58:22 +01:00
prx.py Pull request cherry-pick helper 2023-07-24 18:43:07 -07:00
tsan.suppressions Resolve TSAN-related issues in ctests (#7864) 2022-08-12 19:23:32 +02:00