[ 
https://issues.apache.org/jira/browse/SOLR-16766?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17721518#comment-17721518
 ] 

David Smiley commented on SOLR-16766:
-------------------------------------

In the 9x backport, you probably had a merge conflict on CHANGES.txt and you 
opted to include a change from main that was not in 9x -- this 
[commit|https://github.com/apache/solr/commit/ffedc5bb680e26e48f04899aff4ff3ced7e7c143].
  Please be more careful, like by reviewing the CHANGES.txt delta after 
resolving the conflict to see that it's in fact only the entry you're adding 
and nothing else at all.  I'll handle this in my 9x backport.

Of course, managing CHANGES.txt is a pain and I wonder what we might do instead 
(I've raised this in past years on the dev list).  For further discussion 
elsewhere.

> Remove -usage as option, and ensure both -help and -h work
> ----------------------------------------------------------
>
>                 Key: SOLR-16766
>                 URL: https://issues.apache.org/jira/browse/SOLR-16766
>             Project: Solr
>          Issue Type: Sub-task
>          Components: cli
>    Affects Versions: 9.2
>            Reporter: Eric Pugh
>            Assignee: Eric Pugh
>            Priority: Trivial
>             Fix For: main (10.0), 9.3
>
>          Time Spent: 1h 20m
>  Remaining Estimate: 0h
>
> Nowhere do we mention -usage as a parameter, and it's not one that I ever 
> use.  -help is common, as is -h, so make sure that works everywhere.  there 
> are places wehre -h doesn't work!



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to