Opened 3 years ago

Closed 3 years ago

#2210 closed defect (done)

Add missing changes to stable

Reported by: ascheibe Owned by: ascheibe
Priority: highest Milestone: HeuristicLab 3.3.10
Component: General Version: 3.3.9
Keywords: Cc:

Description

There are some problems where stable and trunk diverge because of missing or wrong merges:

  • BiasedMultiVRPSolutionCrossover/BiasedMultiVRPSolutionManipulator: There was a commit (r10474) in #2146 that did get merged with another ticket (#2119) and another commit (r10504) that fixed a bug introduced in the previous commit. I think they were merged in the wrong order. In any case these 2 files differ from trunk and should not.
  • RandomEnumerable/RandomEnumerableSampleTest: It seems that r10646 and r10503 got lost somewhere or were forgotten in the merge.
  • No problem but inconvenient: In the merge into stable of #2143 r10955 was forgotten. This commit adds a line in SymbolicDataAnalysisSingleObjectivePruningAnalyzer, another one that got merged deleted this line again. Therefore when merging trunk into stable, this line gets re-added.

I detected these problems by merging the complete trunk into stable. There are of course some differences that are ok:

  • the persistence changes that won't make it into this release (#2096, #1802)
  • the conflict in the VRP sample (will be fixed when regenerating the samples for the release)
  • the tree matching stuff (#2164)

Everything else should be the same between trunk and stable.

Change History (10)

comment:1 Changed 3 years ago by ascheibe

  • Status changed from new to accepted

comment:2 Changed 3 years ago by ascheibe

r11166 merged missing r10646 and r10503 into stable

comment:3 Changed 3 years ago by ascheibe

r11167 (re?)merged r10504 into stable

comment:4 Changed 3 years ago by ascheibe

r11168 merged r10955 into stable

comment:5 Changed 3 years ago by ascheibe

r11169 reverted r11168 by hand to get a consistent trunk/stable

comment:6 Changed 3 years ago by ascheibe

  • Owner changed from ascheibe to abeham
  • Status changed from accepted to reviewing

comment:7 Changed 3 years ago by ascheibe

abeham: As discussed these are the changes. Maybe you can have a quick look at it but I think I got everything and it should now be fine.

comment:8 Changed 3 years ago by ascheibe

  • Summary changed from Add missing changes in stable to Add missing changes to stable

comment:9 Changed 3 years ago by abeham

  • Owner changed from abeham to ascheibe
  • Status changed from reviewing to readytorelease

ok

comment:10 Changed 3 years ago by abeham

  • Resolution set to done
  • Status changed from readytorelease to closed

All commits have already been applied to the stable branch

Note: See TracTickets for help on using tickets.