Programming

14417 readers

2 users here now

All things programming and coding related. Subcommunity of Technology.

This community's icon was made by Aaron Schneider, under the CC-BY-NC-SA 4.0 license.

founded 2 years ago

MODERATORS

alyaza@beehaw.org

Hexorg@beehaw.org

remington@beehaw.org

Maintaining patches on top of source distibution (git) (feddit.nu)

submitted 3 weeks ago by wax@feddit.nu to c/programming@beehaw.org

2 comments fedilink hide all child comments

What are some general recommendations to maintain a set of patches on top of a library distributed as a source tarball? Until now I've been adding the versions to a git repository by deleting previous files and adding the new files in a "upstream" branch, then merging that branch into the main branch which contains my patches. This turned into more work than I expected because they started moving files around and renaming in new releases.

I should probably be rebasing instead of merging, but are there any other recommendations for this type of situation?

top 2 comments

sorted by: hot top controversial new old

[–] blaise@champserver.net 5 points 3 weeks ago (1 children)

If you're using linux then check if quilt is available for your distro, it's made specifically to maintain patches on top of a codbase you don't control: https://wiki.debian.org/UsingQuilt

[–] wax@feddit.nu 1 points 3 weeks ago

Thanks, I'll have a look at quilt. There's also a git command called quiltimport which may be helpful if I want to stay on git.