FYI, this was a git bug that will be fixed soon (the range of commits
being rebased was wrong).
https://lore.kernel.org/git/pull.789.git.1605314085.gitgitgad...@gmail.com/T/#t
https://lore.kernel.org/git/20d6104d-ca02-4ce4-a1c0-2f9386ded...@gmail.com/T/#t
Brice
Le 07/02/2020 à 10:27, Brice
FWIW: I have major problems when rebasing if that rebase runs across the point
where a submodule is added. Every file that was removed and replaced by the
submodule generates a conflict. Only solution I could find was to whack the
subdirectory containing the files-to-be-replaced and work thru
On Feb 7, 2020, at 4:27 AM, Brice Goglin via devel
wrote:
>
> PR#7367 was initially on top of PR #7366. When Jeff merged PR#7366, I rebased
> my #7367 with git prrs and got this error:
>
> $ git prrs origin master
> From
> https://github.com/open-mpi/ompi
>
> * branch
Hello
I have a git submodule issue that I don't understand.
PR#7367 was initially on top of PR #7366. When Jeff merged PR#7366, I
rebased my #7367 with git prrs and got this error:
$ git prrs origin master
>From https://github.com/open-mpi/ompi
* branch master ->
The hwloc git submodule just got merged
(https://github.com/open-mpi/ompi/pull/6821).
A new age is upon us!
Be sure you read the wiki before you complain here about your builds being
broken. :-)
https://github.com/open-mpi/ompi/wiki/GitSubmodules
On Jan 8, 2020, at 9:04 AM, Ralph
Actually, I take that back - making a separate PR to change the opal/pmix
embedded component to a submodule was way too painful. I simply added it to the
existing #7202.
> On Jan 7, 2020, at 1:33 PM, Ralph Castain via devel
> wrote:
>
> Just an FYI: there will soon be THREE PRs introducing
Good catches -- I updated the hwloc (to "hwloc2") bit, but I'll leave the
"bar50" edits to Brian/Ralph, since they wrote that section.
Meaning: I *think* you're right, but I'm going to let them do it... :-0
On Jan 7, 2020, at 4:47 PM, Brice Goglin via devel
mailto:devel@lists.open-mpi.org>>
Thanks a lot for writing all this.
At the end
https://github.com/open-mpi/ompi/wiki/GitSubmodules#adding-a-new-submodule-pointing-to-a-specific-commit
should "bar" be "bar50x" in line "$ git add bar" ?
It seems to me that you are in opal/mca/foo and the new submodule is in
"bar50x" (according
Just an FYI: there will soon be THREE PRs introducing submodules - I am
breaking #7202 into two pieces. The first will replace opal/pmix with direct
use of PMIx everywhere and replace the embedded pmix component with a submodule
pointing to PMIx master, and the second will replace ORTE with
We now have two PRs pending that will introduce the use of Git submodules (and
there are probably more such PRs on the way). At last one of these first two
PRs will likely be merged "Real Soon Now".
We've been talking about using Git submodules forever. Now we're just about
ready.
10 matches
Mail list logo
