[jira] [Reopened] (LUCENE-7265) Fix addVersion to merge downstream changes by using the change id

["Steve Rowe (JIRA)" <ji...@apache.org>]

     [ https://issues.apache.org/jira/browse/LUCENE-7265?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Steve Rowe reopened LUCENE-7265:
--------------------------------
      Assignee: Steve Rowe  (was: Anshum Gupta)

Anshum, I know I +1'd this, but was I smoking crack???

I mean, the original code did a {{svn --record-only merge}}, which is useful only as metadata to link commits across branches - no actual changes were pulled in.

But with the change on this issue, addVersion.py tries to pull in version-related changes from another branch that are almost certain to conflict ... and then (in case of success) the script goes and makes all the appropriate changes.

So this change should be reverted.  I'm going to do that now, so that I can successfully run addVersion.py on branch_6x and master for the 6.0.1 release.

> Fix addVersion to merge downstream changes by using the change id
> -----------------------------------------------------------------
>
>                 Key: LUCENE-7265
>                 URL: https://issues.apache.org/jira/browse/LUCENE-7265
>             Project: Lucene - Core
>          Issue Type: Bug
>            Reporter: Anshum Gupta
>            Assignee: Steve Rowe
>         Attachments: LUCENE-7265.patch
>
>
> LUCENE-6938 led to the remove of code that merges the downstream changes for addition of a new version. That seems like an accidental removal and we should add it back with a few changes so that it now uses git instead of svn.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org