check_fixes: give more advice

[next-scripts] / merge_msg

diff --git a/merge_msg b/merge_msg
index 626cf943460a1bd7a8b36a28217f53596cdfeeab..38e6e2e6113d3494806c5163e24009a946c097b3 100755 (executable)
--- a/merge_msg
+++ b/merge_msg
@@ -6,24 +6,39 @@ branch=""
         shift 2
 }
 
-file="$*"
-
-gitk --merge -- $file &
-[ "$file" ] && gvim $file
+gitk --merge -- "$@" &
+# [ "$#" ] && gvim "$@" 2>/dev/null
 
+printf -v files "  %s\n" "$@"
 conf="a conflict"
-[ "$#" -gt 1 ] && {
-       file=${file// /, }
-       file=$(echo $file | sed 's/,\([^,]*\)$/ and\1/')
+[ "$#" -gt 1 ] &&
        conf="conflicts"
-}
 
-subject="manual merge of the BRANCH tree with the  tree"
-body="Today's linux-next merge of the BRANCH tree got $conf in $file between commit  (%22%22) from the  tree and commit  (%22%22) from the BRANCH tree.%0A\
-%0A\
-I fixed it up (see below) and can carry the fix as necessary (no action%0A\
-is required)."
+subject="manual merge of the BRANCH tree with the FIXME tree"
+
+$(dirname $0)/message_helper $branch "$subject" <<EOF
+FIXME: Add owner of second tree to To:
+       Add author(s)/SOB of conflicting commits.
+
+Today's linux-next merge of the BRANCH tree got $conf in:
+
+$files
+between commit:
+
+   ("")
+
+from the FIXME tree and commit:
+
+   ("")
+
+from the BRANCH tree.
 
-$(dirname $0)/message_helper $branch "$subject" "$body"
+I fixed it up (see below) and can carry the fix as necessary. This
+is now fixed as far as linux-next is concerned, but any non trivial
+conflicts should be mentioned to your upstream maintainer when your tree
+is submitted for merging.  You may also want to consider cooperating
+with the maintainer of the conflicting tree to minimise any particularly
+complex conflicts.
+EOF
 
 exit 0