[Python-checkins] CVS: python/dist/src/Tools/scripts logmerge.py,1.6,1.7

Guido van Rossum gvanrossum@users.sourceforge.net
Mon, 09 Apr 2001 20:31:29 -0700


Update of /cvsroot/python/python/dist/src/Tools/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv21220

Modified Files:
	logmerge.py 
Log Message:
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.)


Index: logmerge.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/logmerge.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** logmerge.py	2001/01/17 08:48:39	1.6
--- logmerge.py	2001/04/10 03:31:27	1.7
***************
*** 127,131 ****
                  print sep2,
                  for (p_date, p_working_file, p_rev, p_author) in prev:
!                     print p_date, p_author, p_working_file
                  sys.stdout.writelines(prevtext)
              prev = []
--- 127,131 ----
                  print sep2,
                  for (p_date, p_working_file, p_rev, p_author) in prev:
!                     print p_date, p_author, p_working_file, p_rev
                  sys.stdout.writelines(prevtext)
              prev = []