--- a/build/buildutils/svnchangeids.py	Thu Jul 15 18:31:06 2010 +0300
+++ b/build/buildutils/svnchangeids.py	Thu Aug 19 09:48:13 2010 +0300
@@ -59,6 +59,7 @@
     re_change_id = re.compile("(\w+\#\d+)\s*,?", re.I | re.M)
     re_change_id_keyword = re.compile(change_id_keyword + "[:=]?\s*(\w+\#\d+)",
                                       re.I | re.M)
+    re_change_id_keyword_only = re.compile(change_id_keyword, re.I | re.M)
     svn_change_ids = {}
     cmd = "svn log -r " + rev_2 + ":" + rev_1 + " " + url
     #print cmd
@@ -67,6 +68,11 @@
         if rev:
             current_rev = rev[0]
         change_ids = re_change_id_keyword.findall(line)
+        change_id_keywords = re_change_id_keyword_only.findall(line)
+        if len(change_id_keywords) > len(change_ids):
+            print "WARNING: Rev " + current_rev + \
+                " has more matching changeid keywords" + \
+                " than matching change ids."
         while change_ids:
             for change_id in change_ids:
                 if change_id in svn_change_ids: