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 7ea39f73c95e80c86e10eb960241dc3e7683b76d..f015601a070b652b816dfe5e9e0f6814306a0cc6 100644 |
--- a/tools/push-to-trunk/common_includes.py |
+++ b/tools/push-to-trunk/common_includes.py |
@@ -295,7 +295,7 @@ class VCInterface(object): |
# TODO(machenbach): There is some svn knowledge in this interface. In svn, |
# tag and commit are different remote commands, while in git we would commit |
# and tag locally and then push/land in one unique step. |
- def Tag(self, tag): |
+ def Tag(self, tag, remote): |
raise NotImplementedError() |
@@ -342,7 +342,9 @@ class GitSvnInterface(VCInterface): |
def CLLand(self): |
self.step.GitDCommit() |
- def Tag(self, tag): |
+ def Tag(self, tag, remote): |
+ self.step.GitSVNFetch() |
+ self.step.Git("rebase %s" % remote) |
self.step.GitSVNTag(tag) |