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

Julian Hyde resolved CALCITE-1036.
----------------------------------
       Resolution: Fixed
    Fix Version/s: 1.6.0

Fixed in http://git-wip-us.apache.org/repos/asf/calcite/commit/8bc5f853.

> DiffRepository should not insert new resources at the end of the repository
> ---------------------------------------------------------------------------
>
>                 Key: CALCITE-1036
>                 URL: https://issues.apache.org/jira/browse/CALCITE-1036
>             Project: Calcite
>          Issue Type: Bug
>            Reporter: Julian Hyde
>            Assignee: Julian Hyde
>             Fix For: 1.6.0
>
>
> DiffRepository should not insert new resources at the end of the repository. 
> When merging a patch, it makes it extremely likely that resources added by 
> two development branches will conflict.
> DiffRepository should instead add resources somewhere in the middle at a 
> deterministic place. If the repository is sorted, it should merge into 
> alphabetical order by test case name. If it is not sorted, or only somewhat 
> sorted, it should place the new resource into approximately the right 
> position: resource "aardvark" will go towards the start, and resource "zebra" 
> will go near the end.



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

Reply via email to