Revert "Maintain change log file directly on trunk branch in push-to-trunk." and related changes.

tools/push-to-trunk/push_to_trunk.py

Index: tools/push-to-trunk/push_to_trunk.py
diff --git a/tools/push-to-trunk/push_to_trunk.py b/tools/push-to-trunk/push_to_trunk.py
index 19a0d1d7d26d3f9bfe7401c7bf205922490c39bb..0ebfb9c295c77df304390feccc8355aa77c697bf 100755
--- a/tools/push-to-trunk/push_to_trunk.py
+++ b/tools/push-to-trunk/push_to_trunk.py
@@ -267,12 +267,8 @@ class SquashCommits(Step):
 
   def RunStep(self):
     # Instead of relying on "git rebase -i", we'll just create a diff, because
-    # that's easier to automate. Exclude the ChangeLog file. It is not
-    # maintained on bleeding edge. Changes will be added in a separate step
-    # below.
-    TextToFile(self.GitDiff("svn/trunk",
-                            self["prepare_commit_hash"],
-                            exclude=[self.Config(CHANGELOG_FILE)]),
+    # that's easier to automate.
+    TextToFile(self.GitDiff("svn/trunk", self["prepare_commit_hash"]),
                self.Config(PATCH_FILE))
 
     # Convert the ChangeLog entry to commit message format.
@@ -315,16 +311,6 @@ class ApplyChanges(Step):
     Command("rm", "-f %s*" % self.Config(PATCH_FILE))
 
 
-class AddChangeLog(Step):
-  MESSAGE = "Add ChangeLog changes to trunk branch."
-
-  def RunStep(self):
-    changelog_entry = FileToText(self.Config(NEW_CHANGELOG_FILE))
-    old_change_log = FileToText(self.Config(CHANGELOG_FILE))
-    new_change_log = "%s\n\n\n%s" % (changelog_entry, old_change_log)
-    TextToFile(new_change_log, self.Config(CHANGELOG_FILE))
-    os.remove(self.Config(NEW_CHANGELOG_FILE))
-
 class SetVersion(Step):
   MESSAGE = "Set correct version for trunk."
 
@@ -543,7 +529,6 @@ class PushToTrunk(ScriptsBase):
       SquashCommits,
       NewBranch,
       ApplyChanges,
-      AddChangeLog,
       SetVersion,
       CommitTrunk,
       SanityCheck,