##// END OF EJS Templates
merge: do the trivial resolution after updating sparse checkout...
merge: do the trivial resolution after updating sparse checkout In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be present in wdir and trivial resolution can lead to file not found error. This patch make sure we updates the sparse checkout before doing the trivial resolution. This fixes the test failure demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D3984

File last commit:

r36716:e437de38 default
r38780:d49e490a @94 stable
Show More
README.rst
26 lines | 894 B | text/x-rst | RstLexer
Augie Fackler
fuzz: add a quick README to try and document how to test new fuzzers...
r36698 How to add fuzzers (partially cribbed from oss-fuzz[0]):
1) git clone https://github.com/google/oss-fuzz
2) cd oss-fuzz
3) python infra/helper.py build_image mercurial
4) docker run --cap-add=SYS_PTRACE -it -v $HG_REPO_PATH:/hg-new \
gcr.io/oss-fuzz/mercurial bash
5) cd /src
6) rm -r mercurial
7) ln -s /hg-new mercurial
8) cd mercurial
9) compile
Augie Fackler
fuzz: add some more docs about building/running fuzzers...
r36716 10) ls $OUT
Step 9 is literally running the command "compile", which is part of
the docker container. Once you have that working, you can build the
fuzzers like this (in the oss-fuzz repo):
python infra/helper.py build_fuzzers --sanitizer address mercurial $HG_REPO_PATH
(you can also say "memory", "undefined" or "coverage" for
sanitizer). Then run the built fuzzers like this:
python infra/helper.py run_fuzzer mercurial -- $FUZZER
Augie Fackler
fuzz: add a quick README to try and document how to test new fuzzers...
r36698
0: https://github.com/google/oss-fuzz/blob/master/docs/new_project_guide.md