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

fix(vhd-lib): correct handling of an existing mergeState to restart a interrupted merge #6099

Merged
merged 2 commits into from
Jan 21, 2022

Conversation

fbeauchamp
Copy link
Collaborator

@fbeauchamp fbeauchamp commented Jan 19, 2022

we were checking

assert.strictEqual(parentVhd.header.checksum, state.parent.header)
 assert.strictEqual(childVhd.header.checksum, state.child.header)

before opening parent and child, the error was catched, and the merge was restarted from the beginning

Check list

Check if done, if not relevant leave unchecked.

  • PR reference the relevant issue (e.g. Fixes #007 or See xoa-support#42)
  • if UI changes, a screenshot has been added to the PR
  • documentation updated
  • CHANGELOG.unreleased.md:
    • enhancement/bug fix entry added
    • list of packages to release updated (${name} v${new version})
  • I have tested added/updated features (and impacted code)

Process

  1. create a PR as soon as possible
  2. mark it as WiP: (Work in Progress) if not ready to be merged
  3. when you want a review, add a reviewer (and only one)
  4. if necessary, update your PR, and re- add a reviewer

From the Four Agreements:

  1. Be impeccable with your word.
  2. Don't take anything personally.
  3. Don't make assumptions.
  4. Always do your best.

@julien-f julien-f merged commit 692e72a into master Jan 21, 2022
@julien-f julien-f deleted the fix_merge_restart branch January 21, 2022 11:40
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.

None yet

2 participants