From 0683bad123e7912518c2b2e796b8cf4d1d528b8a Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 2 Nov 2006 13:16:27 +0100 Subject: [PATCH] bugfixes for git-update-changelog.py --- buildscripts/git-update-changelog.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/buildscripts/git-update-changelog.py b/buildscripts/git-update-changelog.py index b788f5118c..5ad922be93 100644 --- a/buildscripts/git-update-changelog.py +++ b/buildscripts/git-update-changelog.py @@ -134,7 +134,7 @@ Run this file from the CVS directory, with commits from the repository in --git- p.add_option ("--start", action='store', default='', - metavar="FIRST" + metavar="FIRST", dest="start", help="all commits starting with FIRST.") @@ -174,13 +174,6 @@ Run this file from the CVS directory, with commits from the repository in --git- log = log[len (first):] file_adddel = [] -<<<<<<< HEAD/buildscripts/git-update-changelog.py -======= - - collated_log = '' - collated_message = '' ->>>>>>> b1b4484cce6e2fe9d312b7617e801efa00dea57b/buildscripts/git-update-changelog.py - collated_log = '' collated_message = '' @@ -238,7 +231,8 @@ Run this file from the CVS directory, with commits from the repository in --git- open ('.msg','w').write (collated_message) print '\nCommit message\n**\n%s\n**\n' % collated_message print '\nRun:\n\n\tcvs commit -F .msg\n\n' - print '\n\techo %s >> .git-commits-done\n\n' % ' '.join (commits_done) + print '\n\techo %s >> .git-commits-done\n\n' % ' '.join ([c.committish + for c in commits_done]) if commits: -- 2.39.2