Fix maintaining change log in push-to-trunk.

Applying the patch on ChangeLog causes local changes. To reset the ChangeLog to its original state, the "-f" option is required.

TBR=jarin@chromium.org

Review URL: https://codereview.chromium.org/201633002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19963 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

tools/push-to-trunk/git_recipes.py

@@ -65,7 +65,7 @@ class GitRecipesMixin(object):
 
   def GitCheckoutFile(self, name):
     assert name
-    self.Git(MakeArgs(["checkout --", name]))
+    self.Git(MakeArgs(["checkout -f --", name]))
 
   @Strip
   def GitCurrentBranch(self):

tools/push-to-trunk/test_scripts.py

@@ -741,7 +741,7 @@ Performance and stability improvements on all platforms.""", commit)
       Git("checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], "",
           cb=ResetChangeLog),
       Git("apply --index --reject \"%s\"" % TEST_CONFIG[PATCH_FILE], ""),
-      Git("checkout -- %s" % TEST_CONFIG[CHANGELOG_FILE], "",
+      Git("checkout -f -- %s" % TEST_CONFIG[CHANGELOG_FILE], "",
           cb=ResetChangeLog),
       Git("add \"%s\"" % TEST_CONFIG[VERSION_FILE], ""),
       Git("commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], "",