Revision: 19996
Author: [email protected]
Date: Mon Mar 17 13:52:33 2014 UTC
Log: Fix branch for resetting change log in push-to-trunk.
The patch is applied to ChangeLog with the "--index" option, which already
updates the index of the file. For resetting the ChangeLog to the trunk
revision, the trunk branch needs to be stated explicitly in the checkout,
otherwise it checks out the already patched HEAD.
TEST=tools/push-to-trunk/script_test.py
[email protected]
Review URL: https://codereview.chromium.org/199993005
http://code.google.com/p/v8/source/detail?r=19996
Modified:
/branches/bleeding_edge/tools/push-to-trunk/git_recipes.py
/branches/bleeding_edge/tools/push-to-trunk/push_to_trunk.py
/branches/bleeding_edge/tools/push-to-trunk/test_scripts.py
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/git_recipes.py Mon Mar 17
08:51:27 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/git_recipes.py Mon Mar 17
13:52:33 2014 UTC
@@ -63,9 +63,10 @@
assert name
self.Git(MakeArgs(["checkout -f", name]))
- def GitCheckoutFile(self, name):
+ def GitCheckoutFile(self, name, branch):
assert name
- self.Git(MakeArgs(["checkout -f --", name]))
+ assert branch
+ self.Git(MakeArgs(["checkout -f", branch, "--", name]))
@Strip
def GitCurrentBranch(self):
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/push_to_trunk.py Sat Mar 15
13:06:08 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/push_to_trunk.py Mon Mar 17
13:52:33 2014 UTC
@@ -318,7 +318,7 @@
# The change log has been modified by the patch. Reset it to the
version
# on trunk and apply the exact changes determined by this
PrepareChangeLog
# step above.
- self.GitCheckoutFile(self.Config(CHANGELOG_FILE))
+ self.GitCheckoutFile(self.Config(CHANGELOG_FILE), "svn/trunk")
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)
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Mon Mar 17
08:51:27 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Mon Mar 17
13:52:33 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 -f -- %s" % TEST_CONFIG[CHANGELOG_FILE], "",
+ Git("checkout -f svn/trunk -- %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.
