M142 merge conflicts #383
Merged
M142 merge conflicts #383
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
This is to fix an issue that happened (intermittently) in the functional tests. There is a race condition where the test is attempting to delete the status cache file, but the status cache might not have been generated for the test repository. To fix this, the test setup will wait for the initial status cache to be generated, so it can proceed from a known state. (cherry picked from commit 97975e4)
Tweak the order that components are shutdown, to shutdown the GitStatusCache before other components that it depends on. This is to prevent problems that might arise from a component being disabled that GitStatusCache depends on. (cherry picked from commit 0c09ed4)
This fixes a bug in TryAcquireGVFSLockForProcess where it does not correctly report whether it was able to acquire the GVFS lock. In cases where this method retries to acquire the lock, it would report success, even if it was not able to acquire the lock. This could lead to problems where commands that depended on the GVFS could run, even if it did not actually have the lock. (cherry picked from commit dfbe657)
…in test setup GitStatusCache: fix race condition in test setup
…unmounting repository Fix lock issue causing problems in unmounting repository
…ues with checks in GetObjectRoot [M139 Port] Fix test reliability issues with checks in GetObjectRoot
…sion Update name of file that GVFS installer creates when an on disk version 16 capable installation is first installed. (cherry picked from commit 120eeba)
… indicates installation version Update name of file that indicates installation version
Merge milestones/M139 to releases/shipped - Status cache - Prefetch in the background
sanoursa
approved these changes
Oct 12, 2018
derrickstolee
approved these changes
Oct 12, 2018
wilbaker
approved these changes
Oct 12, 2018
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.
This resolves the merge conflicts between M142 and releases/shipped.
Resolved by
git merge upstream/releases/shipped -sours