[PATCH][hook script]] Reduce false positives in detect-merge-conflicts.sh

Hi, and thank you for Subversion.

During import, detect-merge-conflicts.sh was reporting false positives
for us. The patch below makes the checking more strict.

Best regards,
Bastiaan Veelo.

--- detect-merge-conflicts.sh.orig 2007-04-13 11:33:07.000000000 +0200
+++ detect-merge-conflicts.sh 2007-04-13 11:34:23.000000000 +0200
@@ -19,7 +19,7 @@

 # We scan through the transaction diff, looking for things that look
 # like conflict markers. If we find one, we abort the commit.
-SUSPICIOUS=$($SVNLOOK diff -t "$TXN" "$REPOS" | grep -E
'^\+(<{7}|={7}|>{7})' | wc -l)
+SUSPICIOUS=$($SVNLOOK diff -t "$TXN" "$REPOS" | grep -E '^\+(<{7}
\.|={7}$|>{7} \.)' | wc -l)

 if [ $SUSPICIOUS -ne 0 ]; then
   echo "Some parts of your commit look suspiciously like merge" >&2

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 13 22:25:54 2007