Append the revision number for each file to the output.

(Yes, this is a new feature right before the 2.1 release.  No, I can't
imagine this would seriously break anybody's code.  In fact, most
users of this script are probably *happy* to see this addition.)

diff --git a/Tools/scripts/logmerge.py b/Tools/scripts/logmerge.py
index 1d9bf2b1d1d5312c7ac231557bdf8054e970aec9..d036749bebcb7914c383fd5a304eab0e421fa0a9 100755 (executable)
--- a/Tools/scripts/logmerge.py
+++ b/Tools/scripts/logmerge.py
@@ -126,7 +126,7 @@ def format_output(database):
             if prev:
                 print sep2,
                 for (p_date, p_working_file, p_rev, p_author) in prev:
-                    print p_date, p_author, p_working_file
+                    print p_date, p_author, p_working_file, p_rev
                 sys.stdout.writelines(prevtext)
             prev = []
         prev.append((date, working_file, rev, author))