From 45aab2b38a65c0f56e6862b071d7792057f9d5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr> Date: Tue, 18 Jan 2022 14:35:59 +0100 Subject: [PATCH] [Eva] Adds .merlin file in Eva to solve file conflicts between plugins. Instructs merlin to first look in Eva directories. --- headers/header_spec.txt | 1 + src/plugins/value/.merlin | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 src/plugins/value/.merlin diff --git a/headers/header_spec.txt b/headers/header_spec.txt index 4e8f0d8ddef..2089aded067 100644 --- a/headers/header_spec.txt +++ b/headers/header_spec.txt @@ -1315,6 +1315,7 @@ src/plugins/studia/writes.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/users/Users.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/users/users_register.ml: CEA_LGPL_OR_PROPRIETARY src/plugins/users/users_register.mli: CEA_LGPL_OR_PROPRIETARY +src/plugins/value/.merlin: .ignore src/plugins/value/Changelog_non_free: .ignore src/plugins/value/Eva.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/value/alarmset.ml: CEA_LGPL_OR_PROPRIETARY diff --git a/src/plugins/value/.merlin b/src/plugins/value/.merlin new file mode 100644 index 00000000000..4a78234301d --- /dev/null +++ b/src/plugins/value/.merlin @@ -0,0 +1,5 @@ +B ./** +S ./** +B ../value_types/** +S ../value_types/** +REC -- GitLab