Mercurial > hg-stable
view tests/test-fuzz-targets.t @ 38498:d4be8ea8f22d
merge: add a 'keepconflictparent' argument to graft
Before this change, `merge.graft` was always dropping the "grafted" changeset
from the parent. This is impractical in case of conflict as the second parent
can be useful to help with conflict resolution.
We add a new boolean parameter to control this behavior. This will make using
`merge.graft` directly in shelve practicable.
Differential Revision: https://phab.mercurial-scm.org/D3692
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 29 May 2018 00:26:20 +0200 |
parents | 46dcb9f14900 |
children | 6c01fad8de32 |
line wrap: on
line source
#require test-repo $ cd $TESTDIR/../contrib/fuzz #if clang-libfuzzer $ make -s clean all #endif #if no-clang-libfuzzer clang-6.0 $ make -s clean all CC=clang-6.0 CXX=clang++-6.0 #endif #if no-clang-libfuzzer no-clang-6.0 $ exit 80 #endif Just run the fuzzers for five seconds each to verify it works at all. $ ./bdiff -max_total_time 5 $ ./mpatch -max_total_time 5 $ ./xdiff -max_total_time 5