[Release] Update merge script to leverage auto-tag bot

tools/release/test_scripts.py

 #!/usr/bin/env python
 # Copyright 2013 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 1139 matching lines @@
     TEST_CONFIG["ALREADY_MERGING_SENTINEL_FILE"] = self.MakeEmptyTempFile()
     TextToFile("", os.path.join(TEST_CONFIG["DEFAULT_CWD"], ".git"))
     self.WriteFakeVersionFile(build=5)
     os.environ["EDITOR"] = "vi"
     extra_patch = self.MakeEmptyTempFile()
 
     def VerifyPatch(patch):
       return lambda: self.assertEquals(patch,
           FileToText(TEST_CONFIG["TEMPORARY_PATCH_FILE"]))
 
-    msg = """Version 3.22.5.1 (cherry-pick)
+    msg = """Merged: Squashed multiple commits.
 
-Merged ab12345
-Merged ab23456
-Merged ab34567
-Merged ab45678
-Merged ab56789
+Merged: Title4
+Hash: ab12345
 
-Title4
+Merged: Title2
+Hash: ab23456
 
-Title2
+Merged: Title3
+Hash: ab34567
 
-Title3
-
-Title1
-
-Revert "Something"
+Merged: Title1
+Hash: ab45678
 
 BUG=123,234,345,456,567,v8:123
 LOG=N
 """
 
     def VerifyLand():
       commit = FileToText(TEST_CONFIG["COMMITMSG_FILE"])
       self.assertEquals(msg, commit)
       version = FileToText(
           os.path.join(TEST_CONFIG["DEFAULT_CWD"], VERSION_FILE))
@@ skipping 359 matching lines @@
 
 Review URL: https://codereview.chromium.org/83173002
 
 ------------------------------------------------------------------------""")
     self.assertEquals(
 """Prepare push to trunk.  Now working on version 3.23.11.
 
 R=danno@chromium.org
 
 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body)