From 97ca679d4b29f9080388cbf9942d0324e1e1e53f Mon Sep 17 00:00:00 2001 From: Steve Rowe Date: Fri, 13 May 2016 16:33:06 -0400 Subject: [PATCH] Revert "LUCENE-7265: Fix addVersion to cherry-pick downstream changes by using the change id" This reverts commit 54b873c2f9b401687c18010aee31c35bcab9660e. --- dev-tools/scripts/addVersion.py | 5 +---- dev-tools/scripts/scriptutil.py | 5 ----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dev-tools/scripts/addVersion.py b/dev-tools/scripts/addVersion.py index 112da45adb9..414e4a12a5c 100644 --- a/dev-tools/scripts/addVersion.py +++ b/dev-tools/scripts/addVersion.py @@ -187,10 +187,7 @@ def read_config(): return c def main(): - c = read_config() - - if c.changeid: - cherry_pick_change(c.changeid) + c = read_config() print('\nAdding new version %s' % c.version) update_changes('lucene/CHANGES.txt', c.version) diff --git a/dev-tools/scripts/scriptutil.py b/dev-tools/scripts/scriptutil.py index f10bf971b6f..216bde433b7 100644 --- a/dev-tools/scripts/scriptutil.py +++ b/dev-tools/scripts/scriptutil.py @@ -121,11 +121,6 @@ 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)