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

mdbx_version description string - e2 #130

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Conversation

battlmonstr
Copy link
Collaborator

No description provided.

mdbx/cursor.go Outdated
@@ -168,7 +170,7 @@ func (c *Cursor) Get(setkey, setval []byte, op uint) (key, val []byte, err error
if op == Set {
key = setkey
} else {
if op != LastDup {
if op != LastDup && op != FirstDup {
Copy link
Collaborator

@AskAlexSharov AskAlexSharov Jan 9, 2024

Choose a reason for hiding this comment

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

FYI: we have 2 versions - Erigon2 (devel) using version v0.27.21(mdbx-go branch v0_27), Erigon3 (e35) using version v0.37.0(mdbx-go branch master).
You will need open same PR into v0_27 branch also.

Copy link
Collaborator

Choose a reason for hiding this comment

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

don't really understand why you have merge conflicts. likely you choose wrong "target branch" for pr?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@AskAlexSharov thanks, you've predicted my question :)

@AskAlexSharov AskAlexSharov changed the base branch from master to v0_27 January 9, 2024 01:22
@battlmonstr battlmonstr changed the title mdbx_version description string mdbx_version description string - e2 Jan 9, 2024
@battlmonstr battlmonstr marked this pull request as ready for review January 9, 2024 08:32
@battlmonstr battlmonstr merged commit 839cb7b into v0_27 Jan 9, 2024
3 checks passed
@battlmonstr battlmonstr deleted the pr/libmdbx_version branch January 9, 2024 08:33
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.

2 participants