From aedb3a75d696b75c3a847abf0352714c53492736 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 13 Nov 2024 21:27:21 +0100
Subject: [PATCH] Adding more details to the conflict log file
---
checking_conflicts.sh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/checking_conflicts.sh b/checking_conflicts.sh
index bfad7a5..63ae686 100644
--- a/checking_conflicts.sh
+++ b/checking_conflicts.sh
@@ -86,6 +86,14 @@ echo "${merge_requests}" | jq -c '.[]' | while read mr; do
result=$?
if [ ! $result == 0 ] ; then
echo "Merge request title: ${mr_title}, Merge Request ID: ${mr_id}" >> conflicting_merge_requests.txt
+ spec=$(git diff --name-only --diff-filter=U | grep -E "(TS|TR)")
+ sed -n '
+ /^<<<<<<< /,/^>>>>>>> / {
+ /^<<<<<<<\|^>>>>>>>/!{=;p}
+ /^>>>>>>> /a\
+
+ }
+ ' ${spec} >> conflicting_merge_requests.txt
conflicting_merge_request_ids+=("${mr_id}")
# Setting label to the merge request which is conflicting with
echo "Setting label to the merge request which is conflicting with: ${mr_id}"
--
GitLab