-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello,
On 19.12.2011 17:24, Stefan Fritsch wrote: > As pointed out elsewhere, there is a public git export. But I am not > sure we want to import that into the debian repo (the .git dir is > about 80MB). But it would be very nice if one could (locally) add it > as git remote and use git diff/cherry-pick/etc. seamlessly. I think that's a good trade-off. The drawback would be that everyone would need to setup a local remote branch tracking upstream manually but I think that can be solved by some documentation similar to what already exists. That said I'd still prefer a layout where the full upstream source is checked in as well. That comes really handy if you ever need to work on an older package or on a package different branches (think of backports). I made a security patch for another package just yesterday and it turned out to be really easy to prepare it out of a complete and consistent snapshot in the repository which was released with stable back then. Note, you can have the full source in conjunction with a remote upstream branch, but you don't need to. > I have (superficially) read a bit about git-buildpackage. It seems its > patch-queue branches do what I want: Switch to the patch-queue branch, > cherry-pick a commit from upstream, and then export the commit into > the debian/patches dir of the main branch. The main branch would then > simply be the debian source package with un-applied debian/patches > dir. Do you think that would work? Actually it is gbp-pq not git-buildpackage, but yes. That works. I guess you already know, if not your proposed workflow is documented in [1]. By the way: This workflow does not break other people's workflow who prefer to manage patches manually with quilt. > Or would you prefer a different workflow/layout? To summarize, what I'd prefer is: * A git repository * Having the full source in trunk * Managing orig.tar.gz tarballs with pristine-tar (thus having a pristine-tar branch which may, or may not be connected to the upstream branch) * Having a remote patch-queue (if we agree to rebase it regularly, otherwise we better keep it local) * Having a local (or remote) upstream branch to cherry pick commits from. [1] https://honk.sigxcpu.org/piki/development/debian_packages_in_git/ - -- with kind regards, Arno Töll IRC: daemonkeeper on Freenode/OFTC GnuPG Key-ID: 0x9D80F36D -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJO74rTAAoJEMcrUe6dgPNtC0UP/R54C38A47D0zwxu0ghutkXc +/JDmjg/X2OSmsmPnODhWrzWhFL8B6YpyqJaEHd4KW/vpJTJxBhKOlsTaclRKfML nIfSkRPlOwCO5Rk15nb7tgllJXMs0Duz+2dKFLywyU63wci0tdMcuDwCECN6x78k bQ1IboOojCPa9AcXiB0cSo7oytC4ijDvicsKDLoJ6TIXD+xnCQ/Lo454KZ+lRmu7 ieR5A3Yb5pKs8CtwxC4lFTs9QtSOJAuwTX0v2+A5AIzWGtovbZ9wXM7A+TUJ7pig EpD9a8Awh6SfWyBr8kVCSf/jSoXk+HGUYVeIf9w5PRgqu+H8xhZcGzQYUJVJMDbv 2mQ9vJTOh7Zkq9ExmBST+RfzVp96JrDGs+8lBssDkl81+QcxTgIfVzxy4pLM36wG xk0V7wzsgoTz1CPIheRP2tYiP2N/3tiwtn4zwlCv9Li+7H44RGANoJSeLoPBKZYj euT+kO6bVlAwZZ7nTlo4a8+9D7w0K5nRFZ7npROa0hKwMoGQ+SOnKEKZan5Fow55 XxKHFvmdqf2QP4pKp9HewVNlQcm31B5DnN6CfwxycZ0I4JgscaSHG9BPPLB/V4o5 jQ3GZDXDpqiuHUYs0T49LSNOvlZZ1Kq9sIPuGIU5cEvWjH6r1FtT1p87a/Ax6An1 TCaMWkrTVIYkcFsh24D7 =b2M6 -----END PGP SIGNATURE----- -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
