Experimental Physics and
Industrial Control System

Ben Franksen via Core-talk <core-talk at aps.anl.gov> · Thu, 26 Mar 2020 21:17:21 +0100

Hi Everyone

In the last few days I have made a few patches to EPICS base. I started
out from Dirk's DB link filter branch, since it looked as if it will be
merged soon.

The changes I made are mostly refactors and cleanups with very minor or
no functional additions. These came up while I was working on how to
best fit in write filters.

My questions now is how to proceed with merge proposals. The changes are
currently a series of four commits on a separate branch. They are
functionally unrelated but may still depend on each another. Should I
try to put them each on a separate branch and issue merge requests for
them separately? The problem is that there will probably be
dependencies, so I'll have to resolve conflicts when I put them on
separate branches. That's not a problem in itself, it's just that when
(and if) they are merged, we have to resolve the same conflicts again
which sounds a bit stupid to me. Another option is to keep the order of
the commits as is, but fork off a new branch for every commit.

How do you normally handle this?

Here is a list of the commit log headers to give you an idea. For the
first I have already made a merge request.

* refactor db_field_log and filters to get rid of dbfl_type_rec
* move optimization for scalar requests from link to channel
* allow array requests to succeed even if we return zero elements
* rename local variable dtyp to field_type in
modules/database/src/ioc/db/dbLink.c

Details including the longer commit logs are at lp:~bfrk/epics-base
branch bfrk-refactors.

Cheers
Ben

________________________________

Helmholtz-Zentrum Berlin für Materialien und Energie GmbH

Mitglied der Hermann von Helmholtz-Gemeinschaft Deutscher Forschungszentren e.V.

Aufsichtsrat: Vorsitzender Dr. Volkmar Dietz, stv. Vorsitzende Dr. Jutta Koch-Unterseher
Geschäftsführung: Prof. Dr. Bernd Rech (Sprecher), Prof. Dr. Jan Lüning, Thomas Frederking

Sitz Berlin, AG Charlottenburg, 89 HRB 5583

Postadresse:
Hahn-Meitner-Platz 1
D-14109 Berlin

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System