fcm make: extract: fix target status on conflict #219
Merged
Conversation
This file contains 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
On conflict, the target status was recorded incorrectly as unchanged. This caused incremental extract to succeed in error. This change fixes the problem.
| @@ -1080,7 +1080,6 @@ sub _target_update { | |||
| ) { | |||
| return _target_delete($attrib_ref, $m_ctx, $ctx, $target); | |||
| } | |||
| $target->set_status($target->ST_UNCHANGED); | |||
| my $path = _target_update_source($attrib_ref, $m_ctx, $ctx, $target); | |||
There was a problem hiding this comment.
FYI: the new test passes when just the target->set_status(...) and my $path = _target_update_source(...) lines are swapped.
There was a problem hiding this comment.
Yes. The change is to ensure that the target status is ST_UNKNOWN until the very last moment, for safety.
|
Looks fine, tests fine. |
|
Looks sensible to me. |
scwhitehouse
added a commit
that referenced
this pull request
Feb 9, 2016
fcm make: extract: fix target status on conflict
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.
On conflict, the target status was recorded incorrectly as unchanged.
This caused incremental extract to succeed in error. This change fixes
the problem.
@benfitzpatrick @scwhitehouse please review.