Re: Using quilt to store patches
martin f krafft a écrit : also sprach Mehdi Dogguy mehdi.dog...@pps.jussieu.fr [2009.05.22.1602 +0200]: - Modify other patches and rebase (if needed). I don't know what you mean with that. Just using git rebase to reorder the patches and keep them in the same order as before and saved in a single commit. Cheers, -- Mehdi Dogguy مهدي الدڤي http://www.pps.jussieu.fr/~dogguy Tel.: (+33).1.44.27.28.38 ___ vcs-pkg-discuss mailing list vcs-pkg-discuss@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/vcs-pkg-discuss
Shared pidgin releases and vcs-pkg
Hello maintainers of pidgin, I have a proposal for you. Personally I do all my package maintainance in git and I find it quite useful to be able to easily merge upstream and rebase my patches. There's also the vcs-pkg[1] initiative which has interesting package maintenance workflows based on git. So this is my idea: have a repository where all the pidgin releases are available in a form so that package mantainers can quickly fetch them. Optionally, each package maintainer can push their patches to this repository so that other people can easily fetch them, and perhaps even share patches between distributions! I've been working on an exact replica of Pidgin's mtn repository. I believe the latest instance of such task is as good as it's every going to get (which is quite good :). The tool (mtn git_export) is now officially part of mtn so everyone can do the conversion themselves and the results would be identical. My proposal would be my current pidgin-clone repository. But alternatively I could create another repository where only the tagged releases are available, so the size of the repo would be much smaller. Also, I guess some maintainers might want the tarball contents as opposed to the versioned files, that could also be versioned in the same repo. So, what do you think? [1] http://vcs-pkg.org/ -- Felipe Contreras ___ vcs-pkg-discuss mailing list vcs-pkg-discuss@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/vcs-pkg-discuss
Re: Using quilt to store patches
On Sun, May 24, 2009 at 03:57:04PM +0200, Stefano Zacchiroli wrote: On Sat, May 23, 2009 at 12:55:57AM +0200, martin f krafft wrote: Now: - all patches are saved in debian/patches/ and can be used directly with quilt. Yes, and you can use TopGit to actually develop features on all those TopGit branches, from which you can create that initial patch series. Now we need to figure out how to get the conflict resolutions you made during your git-am loop back onto the TopGit branches where their features are developed. This is the advantage of TopGit: it's centred around the idea of keeping changes to a feature very close to the feature's branch. I think the approach hinted by Mehdi is quite interesting and that it deserves a bit more of investigation. In particular, what do you think you will loose practically using that instead of full-fledged TopGit? That is not that clear to me. Better, I know what information will not be stored not using TopGit (e.g. the merging history), but practically I don't see any disadvantage descending from that. On the contrary, what you gain is quite clear: you don't fiddle with the complexity of TopGit and you don't have forever lasting branches. Also, your patch history is trivially versioned as the content of debian/patches/ in master. FWIW I'm using a similar scheme except that I don't recreate the patch-queue branch from quilt but simply rebase it frequently on top of the tracked debian branch (i.e. master). I'm keeping different patch-queue branches for each release like: patch-queue/master patch-queue/bpo-lenny patch-queue/experimental The script[1] then figures out which branch I'm on and recreates the patch-queue for that branch. This assumes you have all of the patches condensed on a single branch. In case of team maintenance either push the patch-queue branch too or recreate it from quilt as already described. Cheers, -- Guido [1] http://honk.sigxcpu.org/projects/git-buildpackage/redo-patches ___ vcs-pkg-discuss mailing list vcs-pkg-discuss@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/vcs-pkg-discuss
