Index: tools/push-to-trunk/common_includes.py |
diff --git a/tools/push-to-trunk/common_includes.py b/tools/push-to-trunk/common_includes.py |
index b10f7df5b2f5a8575bcca9c795763a3643d65333..571cb181bbee9f8cb1955df27f4460862e89d791 100644 |
--- a/tools/push-to-trunk/common_includes.py |
+++ b/tools/push-to-trunk/common_includes.py |
@@ -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): |