Uploaded image for project: 'Calcite'
  1. Calcite
  2. CALCITE-1036

DiffRepository should not insert new resources at the end of the repository

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 1.6.0
    • Component/s: None
    • Labels:
      None

      Description

      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.

        Activity

        Show
        julianhyde Julian Hyde added a comment - Fixed in http://git-wip-us.apache.org/repos/asf/calcite/commit/8bc5f853 .
        Hide
        julianhyde Julian Hyde added a comment -

        Resolved in release 1.6.0 (2016-01-22).

        Show
        julianhyde Julian Hyde added a comment - Resolved in release 1.6.0 (2016-01-22).

          People

          • Assignee:
            julianhyde Julian Hyde
            Reporter:
            julianhyde Julian Hyde
          • Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development