Reviewers: jarin,
Message:
PTAL
Description:
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]
Please review this at https://codereview.chromium.org/201633002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+2, -2 lines):
M tools/push-to-trunk/git_recipes.py
M tools/push-to-trunk/test_scripts.py
Index: tools/push-to-trunk/git_recipes.py
diff --git a/tools/push-to-trunk/git_recipes.py
b/tools/push-to-trunk/git_recipes.py
index
6b54510f6365b0d3de1ffd3386570036cc382a3f..4358258d3fc730ed0bc5edaa135fe9006fb8eade
100644
--- a/tools/push-to-trunk/git_recipes.py
+++ b/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):
Index: tools/push-to-trunk/test_scripts.py
diff --git a/tools/push-to-trunk/test_scripts.py
b/tools/push-to-trunk/test_scripts.py
index
cff0a9ad9b3aca2bfd5b2e34904594d87e2894f2..d2a29dac3da94822d40e11c67ff220c7914e5160
100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/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], "",
--
--
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.
