##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

filemerge: add internal merge tool to dump files forcibly...
filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.
Martijn Pieters - - Load All Authors

File last commit:

r28433:3b67f27b default
r32255:7e35d31b default
Show More
fsmonitor
52 lines | 1.3 KiB | text/plain | TextLexer
/ tests / blacklists / fsmonitor
History | Annotation | Raw |Copy content |Copy permalink
# Blacklist for a full testsuite run with fsmonitor enabled.
# Use with
# run-tests --blacklist=blacklists/fsmonitor \
# --extra-config="extensions.fsmonitor="
# The following tests all fail because they either use extensions that conflict
# with fsmonitor, use subrepositories, or don't anticipate the extra file in
# the .hg directory that fsmonitor adds.
test-basic.t
test-blackbox.t
test-check-commit.t
test-commandserver.t
test-copy.t
test-debugextensions.t
test-eol-add.t
test-eol-clone.t
test-eol-hook.t
test-eol-patch.t
test-eol-tag.t
test-eol-update.t
test-eol.t
test-eolfilename.t
test-extension.t
test-fncache.t
test-hardlinks.t
test-help.t
test-inherit-mode.t
test-issue3084.t
test-largefiles-cache.t
test-largefiles-misc.t
test-largefiles-small-disk.t
test-largefiles-update.t
test-largefiles-wireproto.t
test-largefiles.t
test-lfconvert.t
test-merge-tools.t
test-nested-repo.t
test-permissions.t
test-push-warn.t
test-subrepo-deep-nested-change.t
test-subrepo-recursion.t
test-subrepo.t
test-tags.t
# The following tests remain enabled; they fail *too*, but only because they
# occasionally use blacklisted extensions and don't anticipate the warning
# generated.
#test-log.t
#test-hook.t
#test-rename.t
#test-histedit-fold.t
#test-fileset-generated.t
#test-init.t