taproot-manufacturing/entomologist
2
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

WIP: make tags be files in a dir instead of lines in a file #34

Draft
seb wants to merge 7 commits from tags-dir into main
pull from: tags-dir
merge into: taproot-manufacturing:main
Conversation 0 Commits 7 Files changed 12 +267 -14
seb commented 2025-07-23 20:28:01 -06:00
Owner
Copy link
No description provided.
seb added 9 commits 2025-07-23 20:28:02 -06:00 
This will be useful testing (and general consistency) when tags are
files in a directory instead of lines in a file, and thus subject to
random directory order.
Renaming everything also means they have new creation-times, since we're
now git logging a different file/dir.
This is more conflict resistant than the old encoding where tags was a
file with a line per tag.
seb force-pushed tags-dir from b1c32fbf63 to bedcc8a352 2025-07-25 10:22:55 -06:00 Compare
seb force-pushed tags-dir from bedcc8a352 to 3d008bd390 2025-07-26 14:12:43 -06:00 Compare
seb force-pushed tags-dir from 3d008bd390 to 94c5b3fd8f 2025-07-26 14:16:24 -06:00 Compare
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin tags-dir:tags-dir
git checkout tags-dir

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 checkout main
git merge --no-ff tags-dir
git checkout tags-dir
git rebase main
git checkout main
git merge --ff-only tags-dir
git checkout tags-dir
git rebase main
git checkout main
git merge --no-ff tags-dir
git checkout main
git merge --squash tags-dir
git checkout main
git merge --ff-only tags-dir
git checkout main
git merge tags-dir
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
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: taproot-manufacturing/entomologist#34
No description provided.
Delete branch "tags-dir"

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?