lucene-solr:branch_6x: LUCENE-7265: Fix addVersion to cherry-pick downstream changes by using the change id

[an...@apache.org]

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 9a06fb4e2 -> 3ad0201e3


LUCENE-7265: Fix addVersion to cherry-pick downstream changes by using the change id


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3ad0201e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3ad0201e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3ad0201e

Branch: refs/heads/branch_6x
Commit: 3ad0201e3ec6e3e4a509f566383f36493d7ad902
Parents: 9a06fb4
Author: anshum <an...@apache.org>
Authored: Thu Apr 28 17:33:00 2016 -0700
Committer: anshum <an...@apache.org>
Committed: Thu Apr 28 17:34:50 2016 -0700

----------------------------------------------------------------------
 dev-tools/scripts/addVersion.py | 5 ++++-
 dev-tools/scripts/scriptutil.py | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3ad0201e/dev-tools/scripts/addVersion.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/addVersion.py b/dev-tools/scripts/addVersion.py
index ccf1a49..6a4d68c 100644
--- a/dev-tools/scripts/addVersion.py
+++ b/dev-tools/scripts/addVersion.py
@@ -186,7 +186,10 @@ def read_config():
   return c
   
 def main():
-  c = read_config() 
+  c = read_config()
+
+  if c.changeid:
+    cherry_pick_change(c.changeid)
 
   print('\nAdding new version %s' % c.version)
   update_changes('lucene/CHANGES.txt', c.version)

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3ad0201e/dev-tools/scripts/scriptutil.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/scriptutil.py b/dev-tools/scripts/scriptutil.py
index 216bde4..f10bf97 100644
--- a/dev-tools/scripts/scriptutil.py
+++ b/dev-tools/scripts/scriptutil.py
@@ -121,6 +121,11 @@ version_prop_re = re.compile('version\.base=(.*)')
 def find_current_version():
   return version_prop_re.search(open('lucene/version.properties').read()).group(1)
 
+def cherry_pick_change(changeid):
+  print('\nCherry-picking downstream change %s...' % changeid, end='')
+  run('git cherry-pick %s' % changeid)
+  print('done')
+
 if __name__ == '__main__':
   print('This is only a support module, it cannot be run')
   sys.exit(1)