Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conflicts with git extension #24

Closed
jerivas opened this issue Sep 13, 2017 · 1 comment
Closed

Conflicts with git extension #24

jerivas opened this issue Sep 13, 2017 · 1 comment

Comments

@jerivas
Copy link

jerivas commented Sep 13, 2017

It seems like the Mercurial extension breaks the git SCM provider from marking changes in the gutter. I started noticing this with VSCode 1.16.0, when multiple SCM provider support was added. https://code.visualstudio.com/updates/v1_16#_source-control

  • VSCode Version: 1.16.0
  • OS Version: Windows 10

Steps to Reproduce:

  1. Install the Mercurial extension.
  2. Open a project that uses a git repo.
  3. Edit some files. The git sidebar pane detects the changes, but they are not marked in the gutter.
  4. Disable the Mercurial extension and the git gutter markers come back.

Reproduces without extensions: No

@mrcrowl
Copy link
Owner

mrcrowl commented Oct 22, 2017

Thanks @jerivas, and sorry for the trouble. Hg wasn't updated to compensate for multiple SCM providers, introduced in vscode 1.1.6.0. The context flag it relied on was scmProvider = hg which was deprecated.

Work is now underway to correct this in #29.

@mrcrowl mrcrowl closed this as completed Oct 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants