search

tahoe-lafs / magic-folder

Tahoe-LAFS-based file synchronization
Other
25 stars 7 forks source link

identical updates caused conflicts #712

Closed meejah closed 1 year ago

meejah commented 1 year ago

Fixes #713

codecov[bot] commented 1 year ago

Codecov Report

Merging #712 (bebdc9e) into main (192988e) will increase coverage by 0.08%. The diff coverage is 94.44%.

@@            Coverage Diff             @@
##             main     #712      +/-   ##
==========================================
+ Coverage   91.32%   91.41%   +0.08%     
==========================================
  Files          38       38              
  Lines        4936     5006      +70     
  Branches      605      620      +15     
==========================================
+ Hits         4508     4576      +68     
- Misses        297      299       +2     
  Partials      131      131
Flag Coverage Δ
integration 73.71% <63.88%> (+0.08%) :arrow_up:

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/magic_folder/magic_file.py 96.18% <66.66%> (-0.18%) :arrow_down:
src/magic_folder/participants.py 90.22% <91.17%> (+0.32%) :arrow_up:
src/magic_folder/config.py 96.61% <100.00%> (+0.06%) :arrow_up:
src/magic_folder/downloader.py 99.05% <100.00%> (+<0.01%) :arrow_up:
src/magic_folder/uploader.py 93.37% <100.00%> (+2.01%) :arrow_up:

:mega: We’re building smart automated test selection to slash your CI/CD build times. Learn more