diff --git a/tests/blacklists/fsmonitor b/tests/blacklists/fsmonitor --- a/tests/blacklists/fsmonitor +++ b/tests/blacklists/fsmonitor @@ -4,9 +4,7 @@ # 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-commandserver.t -test-copy.t test-debugextensions.t test-eol-add.t test-eol-clone.t diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t --- a/tests/test-blackbox.t +++ b/tests/test-blackbox.t @@ -135,10 +135,17 @@ extension and python hooks - use the eol $ echo '[hooks]' >> .hg/hgrc $ echo 'update = echo hooked' >> .hg/hgrc $ hg update + The fsmonitor extension is incompatible with the eol extension and has been disabled. (fsmonitor !) hooked 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to "d02f48003e62: c" 1 other heads for branch "default" + $ cat >> .hg/hgrc < [extensions] + > # disable eol, because it is not needed for subsequent tests + > # (in addition, keeping it requires extra care for fsmonitor) + > eol=! + > EOF $ hg blackbox -l 6 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> update 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> writing .hg/cache/tags2-visible with 0 tags diff --git a/tests/test-copy.t b/tests/test-copy.t --- a/tests/test-copy.t +++ b/tests/test-copy.t @@ -192,6 +192,7 @@ should show copy XXX: filtering lfilesrepo.status() in 3.3-rc causes the copy source to not be displayed. $ hg st -C --config extensions.largefiles= + The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) M bar foo