Keep svn checkout up-to-date in roll scripts.
BUG=chromium:408523 LOG=n TBR=jarin@chromium.org TEST=script_test.py Review URL: https://codereview.chromium.org/551573002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23755 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
e9916e90f5
commit
199ba41c06
@ -532,6 +532,9 @@ class Step(GitRecipesMixin):
|
||||
def SVNCommit(self, root, commit_message):
|
||||
patch = self.GitDiff("HEAD^", "HEAD")
|
||||
TextToFile(patch, self._config[PATCH_FILE])
|
||||
self.Command("svn", "update", cwd=self._options.svn)
|
||||
if self.Command("svn", "status", cwd=self._options.svn) != "":
|
||||
self.Die("SVN checkout not clean.")
|
||||
if not self.Command("patch", "-d %s -p1 -i %s" %
|
||||
(root, self._config[PATCH_FILE]),
|
||||
cwd=self._options.svn):
|
||||
|
@ -1425,6 +1425,8 @@ git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3456 0039-1c4b
|
||||
expectations = self._bumpUpVersion()
|
||||
expectations += [
|
||||
Cmd("git diff HEAD^ HEAD", "patch content"),
|
||||
Cmd("svn update", "", cwd="[SVN_ROOT]"),
|
||||
Cmd("svn status", "", cwd="[SVN_ROOT]"),
|
||||
Cmd("patch -d branches/bleeding_edge -p1 -i %s" %
|
||||
TEST_CONFIG[PATCH_FILE], "Applied patch...", cwd="[SVN_ROOT]"),
|
||||
Cmd("svn commit --non-interactive --username=author@chromium.org "
|
||||
|
Loading…
Reference in New Issue
Block a user