From: Guido van Rossum <guido@python.org>
Date: Tue, 10 Apr 2001 03:31:27 +0000 (+0000)
Subject: Append the revision number for each file to the output.
X-Git-Tag: v2.1c1~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9e56e117f4074f068fd087c18f2d7f3d612258a;p=thirdparty%2FPython%2Fcpython.git

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 1d9bf2b1d1d5..d036749bebcb 100755
--- 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))