You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/05/13 20:33:53 UTC
lucene-solr:master: Revert "LUCENE-7265: Fix addVersion to
cherry-pick downstream changes by using the change id"
Repository: lucene-solr
Updated Branches:
refs/heads/master 3b0a79a13 -> 97ca679d4
Revert "LUCENE-7265: Fix addVersion to cherry-pick downstream changes by using the change id"
This reverts commit 54b873c2f9b401687c18010aee31c35bcab9660e.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/97ca679d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/97ca679d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/97ca679d
Branch: refs/heads/master
Commit: 97ca679d4b29f9080388cbf9942d0324e1e1e53f
Parents: 3b0a79a
Author: Steve Rowe <sa...@apache.org>
Authored: Fri May 13 16:33:06 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri May 13 16:33:06 2016 -0400
----------------------------------------------------------------------
dev-tools/scripts/addVersion.py | 5 +----
dev-tools/scripts/scriptutil.py | 5 -----
2 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/97ca679d/dev-tools/scripts/addVersion.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/addVersion.py b/dev-tools/scripts/addVersion.py
index 112da45..414e4a1 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)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/97ca679d/dev-tools/scripts/scriptutil.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/scriptutil.py b/dev-tools/scripts/scriptutil.py
index f10bf97..216bde4 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)