Skip to content

Robustness/speed fixes to work packages#62

Merged
wonder-sk merged 2 commits into
mainfrom
fix-wp-issues
Feb 6, 2024
Merged

Robustness/speed fixes to work packages#62
wonder-sk merged 2 commits into
mainfrom
fix-wp-issues

Conversation

@wonder-sk

@wonder-sk wonder-sk commented Feb 3, 2024

Copy link
Copy Markdown
Contributor

Fixes #60 - works around geodiff bug by only doing rebase when both diffs are not empty (good practice anyway)
Fixes #61 - we were doing diff [wp_base -> master_output] instead of [master_base -> master_output] ... this was creating exceedingly large diffs for larger files, and may have cause incorrect merges of data as well
Fixes #46 - adds DEBUG_DIFFS to wp.py

cc @erpas

Comment thread workpackages/wp.py
@PeterPetrik

Copy link
Copy Markdown
Contributor

Would it be possible to add some auto test to catch the error you fixed?

@wonder-sk

Copy link
Copy Markdown
Contributor Author

Would it be possible to add some auto test to catch the error you fixed?

On a second thought, there should not be a particular bug that would make data merging incorrect, it was just that it was very slow even for reasonably sized data, so no change in behavior

@wonder-sk wonder-sk merged commit e18ed86 into main Feb 6, 2024
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

Successfully merging this pull request may close these issues.

Inefficient merging of data Merging data together may not work correctly Debug mode

2 participants