Revision: 19963
Author: [email protected]
Date: Mon Mar 17 08:51:27 2014 UTC
Log: 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.
[email protected]
Review URL: https://codereview.chromium.org/201633002
http://code.google.com/p/v8/source/detail?r=19963
Modified:
/branches/bleeding_edge/tools/push-to-trunk/git_recipes.py
/branches/bleeding_edge/tools/push-to-trunk/test_scripts.py
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/git_recipes.py Sat Mar 15
13:06:08 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/git_recipes.py Mon Mar 17
08:51:27 2014 UTC
@@ -65,7 +65,7 @@
def GitCheckoutFile(self, name):
assert name
- self.Git(MakeArgs(["checkout --", name]))
+ self.Git(MakeArgs(["checkout -f --", name]))
@Strip
def GitCurrentBranch(self):
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Sat Mar 15
13:06:08 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Mon Mar 17
08:51:27 2014 UTC
@@ -741,7 +741,7 @@
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], "",
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
