sqoop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject git commit: SQOOP-1427: Sqoop2: Add support for branch SQOOP-1367 to pre-commit build
Date Mon, 11 Aug 2014 22:06:32 GMT
Repository: sqoop
Updated Branches:
  refs/heads/sqoop2 3c93930bf -> 26c0e8b88


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/26c0e8b8
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/26c0e8b8
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/26c0e8b8

Branch: refs/heads/sqoop2
Commit: 26c0e8b88456cfd991e35cad354028da9e73957d
Parents: 3c93930
Author: Abraham Elmahrek <abraham@elmahrek.com>
Authored: Mon Aug 11 15:05:35 2014 -0700
Committer: Abraham Elmahrek <abraham@elmahrek.com>
Committed: Mon Aug 11 15:05:35 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/26c0e8b8/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):


Mime
View raw message