Matthew Vernon <matt...@debian.org> writes: > On 14/04/14 16:44, Emmanuel Bourg wrote:
>> I saw that you mentioned patches managed by Git, do you have some >> documentation on how this is performed exactly? Most of the packages >> I've seen use quilt to manage the patches and I'm not sure I would know >> how to update such a package properly. > I used the approach Russ describes here (in case that seems like an odd > approach, I did this because I was working towards the Shibboleth IdP > package, and this is the approach the shibboleth team takes). > http://www.eyrie.org/~eagle/notes/debian/git.html > I'm not wedded to this approach, though. It's probably worth noting that I'm slowly switching to gbp pq (which is basically a lightweight version of git-dpm as near as I can tell) for managing patches, which generates a quilt series at the cost of making revision history on the patches more complex. I haven't updated that page in a while with new techniques and really need to make some time to do that. That said, applying patches directly to the master branch in Git was workable for a long time, and git diff upstream tells you most everything you need to know about status. I mostly started switching to gbp pq because of two reasons: I'm increasingly convinced that single-debian-patch causes various problems (for example, debdiffs are even more annoying than normal because the order of files changed in the diff is not guaranteed), and it makes it much more annoying to extract a single patch and submit it upstream. You can duplicate the latter functionality by maintaining separate topic branches and merging them all, but I found that got tedious, and gbp pq is now mature enough that it mostly does what I want. -- Russ Allbery (r...@debian.org) <http://www.eyrie.org/~eagle/> -- To UNSUBSCRIBE, email to debian-java-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/8761mb77sk....@windlord.stanford.edu
