ENH: Replace --no-merges with --first-parent for comment #76
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hjmjohnson
force-pushed
the
fix-first-parent-comment
branch
from
d7ae489 to
b309ca0
Compare
hjmjohnson
force-pushed
the
fix-first-parent-comment
branch
from
b309ca0 to
d2f76a5
Compare
thewtex
previously requested changes
Mar 17, 2019
hjmjohnson
force-pushed
the
fix-first-parent-comment
branch
from
d2f76a5 to
d1171d9
Compare
dzenanz
approved these changes
Mar 18, 2019
hjmjohnson
force-pushed
the
fix-first-parent-comment
branch
from
d1171d9 to
ba5a6cc
Compare
|
Any ideas why the build is failing? |
3 executables cannot be found, the others are not run: |
When walking through the git histories, we want the parent versions of the previous commits rather than the --no-merges. The --no-merges results in failures for the merges that include (vnl, hdf5, or other Thirdparty updates).
Clean the build tree of items from vcl and hdf5 builds that can be left over from other build locations. These old file artifacts can cause build failures due to the old file location taking precidence over the new file location (vcl_compiler_header.h), or imcompatible library bulding due to a glob expression including a file that does not belong to the source tree any longer (hdf5).
Select the patch that renames NumberOfThreads to NumberOfWorkUnits. Use a cmake driven option to indicate which code spelling should be used.
hjmjohnson
force-pushed
the
fix-first-parent-comment
branch
from
ba5a6cc to
3b35969
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When walking through the git histories, we want the parent versions
of the previous commits rather than the --no-merges. The --no-merges
results in failures for the merges that include (vnl, hdf5, or other
Thirdparty updates).