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.
Description
Found and fixed an LfMerge build issue that was causing the LfMerge build for FieldWorks 8.2 to be incorrectly pulling in the DLLs from FieldWorks 8.3. This was causing older projects, such as my test-rmunn-04 project, to fail to clone correctly.
LfMerge version 2.0.115 has the bugfix; this is the version we should deploy next time we push a Language Forge release.
Type of Change
Only keep lines below that describe this change, then delete the rest.
Screenshots
Please provide screenshots / animations for any change that involves the UI. Please provide animations to demonstrate user interaction / behavior changes
Testing on your branch
Please describe how to test and/or verify your changes. Provide instructions so we can reproduce. Please also provide relevant test data as necessary. These instructions will be used for QA testing below.
The "delete and re-clone" step is necessary because if a previous clone attempt is still in the
webwork
directory, LfMerge will use that to figure out the correct DbVersion to use. The bug only triggers when there is no previous clone attempt inwebwork
and LfMerge has to run a Mercurial clone process in order to figure out the correct DbVersion. By deleting the project, you ensure that itswebwork
folder will be emptied and so the second clone attempt will work.To identify projects suitable for using for this test, run
hg clone https://username:password@hg-public.languagedepot.org/projectCode
on a project you have access to in Language Depot. Then enter that project's directory and runhg log
, orhg log | less
ifhg log
doesn't pipe throughless
by default on your machine. Look at the branch numbers for each commit. Are they all 7000068 or earlier? Then this project is suitable. Are any of them 7000070 or 7000072 (or 7500000.7000072)? Then that project won't be a suitable test to see if this bug was squashed.Checklist
qa.languageforge.org testing
Reviewers: add/replace your name below and check the box to sign-off/attest the feature works as expected on qa.languageforge.org