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

Add patch for XSI-1457 to ocaml-vhd #667

Merged

Conversation

lindig
Copy link
Collaborator

@lindig lindig commented Feb 28, 2024

We are patching an upstream project by adding a patch to the opam file. The original is here:

xapi-project/xen-api@db4d465

@lindig lindig marked this pull request as ready for review February 28, 2024 15:30
+ s >>= fun next ->
+ match (next, acc) with
| End, None -> return End
- | End, Some x -> return (Cons(x, fun () -> return End))
Copy link
Contributor

Choose a reason for hiding this comment

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

why is it deleting this line and then add the same one back in line 67?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I would not focus on the shape of the diff and more on the result. I had to do this manually and first re-formatted the existing code and then changed it. So it's important not to miss something.

@lindig lindig requested a review from robhoes February 29, 2024 10:12
@psafont
Copy link
Member

psafont commented Mar 1, 2024

I could have sworn I had added a comment already. Please change the version to 0.12.0+1 to make it obvious there's a patch applied when looking at the version

Signed-off-by: Christian Lindig <[email protected]>
@lindig lindig force-pushed the release/yangtze/lcm branch from ac5bb81 to 678aa69 Compare March 1, 2024 10:38
@lindig
Copy link
Collaborator Author

lindig commented Mar 1, 2024

I've bumped the version to 0.12.1 @psafont

@lindig lindig merged commit 1649dfe into xapi-project:release/yangtze/lcm Mar 4, 2024
2 checks passed
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.

4 participants