diff --git a/bin/maint/mergexx b/bin/maint/mergexx index 6029c03fadec85ce434c0977df7cd708a71b7359..2741a63f64a078cc0486b88a2f7a333d50d915e8 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 355ea10353d4096bdb99e149d0a276e7583d4708..8b2cbcda7d2f246786ace95af5a527bca524a966 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"],