From 1c1a31ee56dfc6ee8303e138cefab9f456b15d30 Mon Sep 17 00:00:00 2001
From: Mathieu Courtois <mathieu.courtois@edf.fr>
Date: Tue, 15 Jan 2019 17:34:44 +0100
Subject: [PATCH] [#28360] Check merge with edf/default branch for asterstudy
repo.
--HG--
branch : edf/mc
---
bin/maint/mergexx | 1 -
lib/hgaster/ascommands.py | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/bin/maint/mergexx b/bin/maint/mergexx
index 6029c03f..2741a63f 100755
--- a/bin/maint/mergexx
+++ b/bin/maint/mergexx
@@ -65,7 +65,6 @@ run_main()
printf "\ncommitting with message '${msg}'...\n"
hg ci -m "${msg}" || _error "failed"
- printf "\nDo not forget to submit the new revision!\n"
return ${?}
}
diff --git a/lib/hgaster/ascommands.py b/lib/hgaster/ascommands.py
index 355ea103..8b2cbcda 100644
--- a/lib/hgaster/ascommands.py
+++ b/lib/hgaster/ascommands.py
@@ -1162,7 +1162,7 @@ class SubmitAsterStudy(AbstractSubmitSmeca):
"""Check AsterStudy source files at the parent revision
and, in case of success, submit changesets for continuous integration.
"""
- command_automerge = ["./check_automerge.sh"]
+ command_automerge = ["./check_automerge_edf.sh"]
command_lint = ["./check_lint.sh", "-p"]
command_tests = [["./check_salome.sh", "-c"],
["./check_docs.sh"],
--
GitLab