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 6eeb323e43a3d7add3ea23dfbcb72b58ce240993..6d1aec5af9ef92506f8e8105399fe1d7f92b1c8b 100644 |
--- a/tools/push-to-trunk/test_scripts.py |
+++ b/tools/push-to-trunk/test_scripts.py |
@@ -963,7 +963,10 @@ Performance and stability improvements on all platforms.""", commit) |
Cmd("svn status", "", cwd=svn_root), |
Cmd("patch -d trunk -p1 -i %s" % |
TEST_CONFIG["PATCH_FILE"], "Applied patch...", cwd=svn_root), |
- Cmd("svn add --force trunk", "", cwd=svn_root), |
+ Cmd("svn status", "M OWNERS\n? new_file\n! AUTHORS", |
+ cwd=svn_root), |
+ Cmd("svn add --force new_file", "", cwd=svn_root), |
+ Cmd("svn delete --force AUTHORS", "", cwd=svn_root), |
Cmd("svn commit --non-interactive --username=author@chromium.org " |
"--config-dir=[CONFIG_DIR] " |
"-m \"Version 3.22.5 (based on push_hash)\"", |
@@ -1786,7 +1789,7 @@ git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3456 0039-1c4b |
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 add --force branches/bleeding_edge", "", cwd=svn_root), |
+ Cmd("svn status", "M src/version.cc", cwd=svn_root), |
Cmd("svn commit --non-interactive --username=author@chromium.org " |
"--config-dir=[CONFIG_DIR] " |
"-m \"[Auto-roll] Bump up version to 3.11.6.0\"", |