You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ab...@apache.org on 2014/08/12 00:05:09 UTC
git commit: SQOOP-1427: Sqoop2: Add support for branch SQOOP-1367 to
pre-commit build
Repository: sqoop
Updated Branches:
refs/heads/SQOOP-1367 8f8977261 -> bcc66bb7e
SQOOP-1427: Sqoop2: Add support for branch SQOOP-1367 to pre-commit build
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/bcc66bb7
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/bcc66bb7
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/bcc66bb7
Branch: refs/heads/SQOOP-1367
Commit: bcc66bb7efe473d134261951fab933fb158b2de7
Parents: 8f89772
Author: Abraham Elmahrek <ab...@elmahrek.com>
Authored: Mon Aug 11 15:04:28 2014 -0700
Committer: Abraham Elmahrek <ab...@elmahrek.com>
Committed: Mon Aug 11 15:04:28 2014 -0700
----------------------------------------------------------------------
dev-support/test-patch.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/bcc66bb7/dev-support/test-patch.py
----------------------------------------------------------------------
diff --git a/dev-support/test-patch.py b/dev-support/test-patch.py
index ae44b60..f22ef6d 100755
--- a/dev-support/test-patch.py
+++ b/dev-support/test-patch.py
@@ -44,7 +44,9 @@ def sqoop_guess_branch(versions):
for v in versions:
tmp_branch = None
- if v.startswith("1.99") or v.startswith("2.0"):
+ if v.startswith("from/to"):
+ tmp_branch = "SQOOP-1367"
+ elif v.startswith("1.99") or v.startswith("2.0"):
tmp_branch = "sqoop2"
else:
tmp_branch = "trunk"
@@ -59,7 +61,7 @@ def sqoop_guess_branch(versions):
# Verify supported branch
def sqoop_verify_branch(branch):
- return branch in {"sqoop2", "SQOOP-1082"}
+ return branch in {"sqoop2", "SQOOP-1082", "SQOOP-1367"}
def execute(cmd, log=True):
if log:
@@ -179,7 +181,7 @@ def git_checkout(result, branch):
result.fatal("git reset failed")
if execute("git fetch origin") != 0:
result.fatal("git fetch failed")
- if execute("git merge --ff-only origin/sqoop2"):
+ if execute("git merge --ff-only origin/%s" % (branch)):
result.fatal("git merge failed")
def git_apply(result, cmd, patch_file, strip, output_dir):