← Back to context

Comment by cryptonector

2 days ago

Quilt is difficult to maintain, but a quilt-like workflow? Easy: it's just a branch with all patches as commits. You can re-apply those to new releases of the upstream by using `git rebase --onto $new_upstream_commit_tag_or_branch`.

How do you track changes to the patches themselves?

  • By having a naming convention for your tags and branches, then you can always identify the upstream "base" upon which the Debian "patches" are based, and then you can trivially use `git log` to list them.

    Really, Git has a solution to this. If you insist that it doesn't without looking, you'll just keep re-inventing the wheel badly.

    • but then if I want to see the history for a specific patch, or bisect them?

      mercurial has a patch queue extension that married it and quilt, which was very easy to use

      5 replies →

  • You can keep the old branches around if you want. Or merge instead of rebasing.