Open MPI logo

Open MPI Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Development mailing list

Subject: Re: [OMPI devel] RFC: merge windows branch into trunk
From: Tim Mattox (timattox_at_[hidden])
Date: 2008-11-20 08:53:13

I have two concerns. First is that we really need to focus on
getting 1.3 stable and released. My second concern with
this is how will it effect merging of bugfixes for 1.3 from the
trunk once we release 1.3. Will the following modified files
cause merge conflicts for CMRs? How big is this diff,
can you send it to the list, or otherwise make it available?

> M ompi/runtime/ompi_mpi_init.c
> M opal/event/event.c
> M opal/event/WIN32-Code/win32.c
> M opal/mca/base/mca_base_param.c
> M opal/mca/installdirs/windows/opal_installdirs_windows.c
> M opal/runtime/opal_cr.c
> M opal/win32/ompi_misc.h
> M opal/win32/win_compat.h
> M orte/mca/plm/ccp/plm_ccp_component.c
> M orte/mca/plm/ccp/plm_ccp_module.c
> M orte/mca/plm/process/plm_process_module.c
> M orte/mca/ras/ccp/ras_ccp_component.c
> M orte/mca/ras/ccp/ras_ccp_module.c
> M orte/runtime/orte_wait.c
> M orte/tools/orterun/orterun.c
> M orte/util/hnp_contact.c

I would ask that you consider breaking these
modifications into parts that "could" be harmlessly
brought over independently to 1.3, if a subsequent
non-windows bugfix to one of those files needs to
be brought over that will only merge cleanly if some
of your changes to the same file are also brought over.
For example, it would be a real pain to have to use
patchfiles to resolve merge conflicts simply because
of an #ifdef or white-space change here or there.
Hopefully that made sense...

Although I don't use windows myself, I appreciate your
and others' efforts to expand the number of platforms
we can run on. Great work!

Tim Mattox, Ph.D. -
 tmattox_at_[hidden] || timattox_at_[hidden]
    I'm a bright...