devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

wip: revert: restore pre-upstream-merge baseline (tree of 3b673150b) #141

Draft
jabber.developer2 wants to merge 1 commits from rollback/pre-upstream-merge into master
pull from: rollback/pre-upstream-merge
merge into: devs:master
Conversation 1 Commits 1 Files Changed 311 +9908 -11285
jabber.developer2 commented 2026-06-29 09:20:07 +00:00
Collaborator
Copy Link

Summary

This PR rolls the tree back to the pre-merge baseline 3b673150b, undoing the large upstream sync merge 72f4f186d and the 13 post-merge commits layered on top of it. It is a single forward commit (f9e184eda) whose tree is bit-for-bit identical to 3b673150b — not a force-push/reset — so the full history stays intact and the PR shows a normal reverse diff.

Why

Multiple issues and unstability of upstream.

Scope

  • 311 files changed (the exact inverse of merge + post-merge work): +9897 / -11274
  • Tree after this commit == tree of 3b673150b (verified: git diff HEAD 3b673150b is empty)
  • Build system returns to autotools-only state (Meson files introduced by the sync are removed again)

References

  • Baseline (restored): 3b673150b chore(chatlog): disable background message file logging (stage 1)
  • Undone merge: 72f4f186d merge: sync upstream profanity-im/profanity (303 files)
  • Branch tip before rollback: ca92d2917

Reversibility

Nothing is lost. The merge and every post-merge commit remain reachable in history and can be cherry-picked back selectively. Caveat: most post-merge commits (UI pad sizing adb078a3e/3f6b8f69f/ca92d2917, autoping 02e679c27/15dfc2bdb, OTR/OMEMO correctness 830479cf2) were written against merged infrastructure, so re-applying them onto this baseline is a manual port, not a clean pick.

## Summary This PR rolls the tree back to the **pre-merge baseline** `3b673150b`, undoing the large upstream sync merge `72f4f186d` and the 13 post-merge commits layered on top of it. It is a single forward commit (`f9e184eda`) whose tree is bit-for-bit identical to `3b673150b` — not a force-push/reset — so the full history stays intact and the PR shows a normal reverse diff. ## Why Multiple issues and unstability of upstream. ## Scope - 311 files changed (the exact inverse of merge + post-merge work): `+9897 / -11274` - Tree after this commit == tree of `3b673150b` (verified: `git diff HEAD 3b673150b` is empty) - Build system returns to autotools-only state (Meson files introduced by the sync are removed again) ## References - **Baseline (restored):** `3b673150b` chore(chatlog): disable background message file logging (stage 1) - **Undone merge:** `72f4f186d` merge: sync upstream profanity-im/profanity (303 files) - **Branch tip before rollback:** `ca92d2917` ## Reversibility Nothing is lost. The merge and every post-merge commit remain reachable in history and can be cherry-picked back selectively. Caveat: most post-merge commits (UI pad sizing `adb078a3e`/`3f6b8f69f`/`ca92d2917`, autoping `02e679c27`/`15dfc2bdb`, OTR/OMEMO correctness `830479cf2`) were written against merged infrastructure, so re-applying them onto this baseline is a manual port, not a clean pick.
jabber.developer2 added 1 commit 2026-06-29 09:20:08 +00:00
revert: restore pre-upstream-merge baseline (tree of 3b673150b)
All checks were successful
CI Code / Check spelling (pull_request) Successful in 18s
Details
CI Code / Check coding style (pull_request) Successful in 30s
Details
CI Code / Linux (ubuntu) (pull_request) Successful in 4m51s
Details
CI Code / Linux (debian) (pull_request) Successful in 6m59s
Details
CI Code / Linux (arch) (pull_request) Successful in 10m12s
Details
CI Code / Code Coverage (pull_request) Successful in 6m44s
Details
f9e184eda7 
Roll the tree back to the pre-merge tip 3b673150b, undoing the upstream sync merge 72f4f186d (303 files) and the 13 post-merge commits layered on top of it.

Purpose: restore the last pre-sync baseline so the reported OMEMO/OTR encryption regressions can be reproduced against a known-good state and the upstream sync ruled in or out as the cause. Nothing is dropped from history; the merge and every post-merge commit remain reachable and can be cherry-picked back selectively.

Baseline:     3b673150b chore(chatlog): disable background message file logging (stage 1)

Undoes merge: 72f4f186d merge: sync upstream profanity-im/profanity
jabber.developer commented 2026-06-29 15:37:03 +00:00
Owner
Copy Link

I will keep it for a month in case of emergency issues.

I will keep it for a month in case of emergency issues.
jabber.developer changed title from revert: restore pre-upstream-merge baseline (tree of 3b673150b) to wip: revert: restore pre-upstream-merge baseline (tree of 3b673150b) 2026-06-29 15:37:16 +00:00
All checks were successful
CI Code / Check spelling (pull_request) Successful in 18s
Required
Details
CI Code / Check coding style (pull_request) Successful in 30s
Required
Details
CI Code / Linux (ubuntu) (pull_request) Successful in 4m51s
Required
Details
CI Code / Linux (debian) (pull_request) Successful in 6m59s
Required
Details
CI Code / Linux (arch) (pull_request) Successful in 10m12s
Required
Details
CI Code / Code Coverage (pull_request) Successful in 6m44s
Required
Details
This pull request has changes conflicting with the target branch.
  • src/common.c
  • src/config/preferences.c
  • src/pgp/gpg.c
  • src/pgp/gpg.h
  • src/xmpp/jid.c
  • src/xmpp/message.c
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin rollback/pre-upstream-merge:rollback/pre-upstream-merge
git checkout rollback/pre-upstream-merge
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
Compat/Breaking
Breaking change that won't be backward compatible
Kind/Bug
Something is not working
Kind/Documentation
Documentation changes
Kind/Enhancement
Improve existing functionality
Kind/Feature
New functionality
Kind/Security
This is security issue
Kind/Testing
Issue or pull request related to testing
Priority
Critical
1
The priority is critical
Priority
High
2
The priority is high
Priority
Low
4
The priority is low
Priority
Medium
3
The priority is medium
Reviewed
Confirmed
1
Issue has been confirmed
Reviewed
Duplicate
2
This issue or pull request already exists
Reviewed
Invalid
3
Invalid issue
Reviewed
Won't Fix
3
This issue won't be fixed
Status
Abandoned
3
Somebody has started to work on this but abandoned work
Status
Blocked
1
Something is blocking this issue or pull request
Status
Need More Info
2
Feedback is required to reproduce issue or to continue work
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
admin jabber.developer jabber.developer2
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: devs/cproof#141
No description provided.
Delete Branch "rollback/pre-upstream-merge"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?