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

Update LfMerge to use Mercurial 6 and .NET 8 #1789

Merged
merged 1 commit into from
Apr 30, 2024

Conversation

rmunn
Copy link
Collaborator

@rmunn rmunn commented Mar 27, 2024

Fixes #1788

Description

LfMerge has been on Mercurial 3 for a long time, and we've had constant trouble with HTTPS certificates because our Mercurial version was too old to support SNI. Moving to Mercurial 6 (and Python 3) will fix that.

Screenshots

Demonstrate any UI / behavioral changes with screenshots or animations.

Checklist

  • I have labeled my PR with: bug, feature, engineering, security fix or testing
  • I have performed a self-review of my own code
  • I have reviewed the title & description of this PR which I will use as the squashed PR commit message
  • I have commented my code, particularly in hard-to-understand areas
  • I have added tests that prove my fix is effective or that my feature works
  • I have enabled auto-merge (optional)

Testing

Testers, use the following instructions against our staging environment. Post your findings as a comment and include any meaningful screenshots, etc.

Describe how to verify your changes and provide any necessary test data.

  • Do multiple Send/Receives (a clone, a pull, a push, and at least one merge where the project is edited in FLEx and in Language Forge at the same time), and make sure they all succeed.

@rmunn rmunn added the engineering Tasks which do not directly relate to a user-facing feature or fix label Mar 27, 2024
@rmunn rmunn self-assigned this Mar 27, 2024
Copy link

Unit Test Results

362 tests   362 ✅  13s ⏱️
 37 suites    0 💤
  1 files      0 ❌

Results for commit c3b2579.

Copy link
Collaborator

@megahirt megahirt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Happy to test this once it's merged!

@rmunn rmunn merged commit 6efc4b5 into develop Apr 30, 2024
17 checks passed
@rmunn rmunn deleted the feat/update-lfmerge-to-mercurial-6 branch April 30, 2024 09:57
@megahirt
Copy link
Collaborator

FWIW the error I receive before this merge (and that this PR should address) looks like this in the lfmerge logs:
System.ApplicationException: abort: error: [SSL: SSLV3_ALERT_HANDSHAKE_FAILURE] sslv3 alert handshake failure (_ssl.c:727)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
engineering Tasks which do not directly relate to a user-facing feature or fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update LfMerge to Mercurial 6
2 participants