internal/quorum/qsql: don't nest transactions #1

Open

riscdanger wants to merge 1 commit from qsql-session-txn into main

pull from: qsql-session-txn

merge into: riscdanger:main

riscdanger:main

Conversation 0 Commits 1 Files changed 1 +11 -1

riscdanger commented 2026-02-04 15:50:56 +00:00

Owner

Copy link

• add test confirming this behavior

- [ ] add test confirming this behavior

riscdanger added 1 commit 2026-02-04 15:50:57 +00:00

internal/quorum/qsql: don't nest transactions f951ffb1b1

This pull request has changes conflicting with the target branch.

• internal/quorum/qsql/session.go

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin qsql-session-txn:qsql-session-txn

git switch qsql-session-txn

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff qsql-session-txn

git switch qsql-session-txn

git rebase main

git switch main

git merge --ff-only qsql-session-txn

git switch qsql-session-txn

git rebase main

git switch main

git merge --no-ff qsql-session-txn

git switch main

git merge --squash qsql-session-txn

git switch main

git merge --ff-only qsql-session-txn

git switch main

git merge qsql-session-txn

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: riscdanger/kerneldump#1

No description provided.