Path: csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod From: Barry Warsaw Newsgroups: linux.debian.maint.python Subject: Re: How to maintain multiple branches (sid/bpo/exp etc)? Date: Tue, 03 Nov 2015 00:50:02 +0100 Message-ID: References: X-Original-To: debian-python@lists.debian.org X-Mailbox-Line: From debian-python-request@lists.debian.org Mon Nov 2 23:44:04 2015 Old-Return-Path: X-Amavis-Spam-Status: No, score=-6.9 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, FOURLA=0.1, LDO_WHITELIST=-5] autolearn=ham autolearn_force=no X-Policyd-Weight: using cached result; rate:hard: -5 Organization: The Organization of Unorganized Woozalists X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Mailing-List: archive/latest/13137 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20151102174343.1f677f6a@anarchist Approved: robomod@news.nic.it Lines: 43 Sender: robomod@news.nic.it X-Original-Date: Mon, 2 Nov 2015 17:43:43 -0600 X-Original-Message-ID: <20151102174343.1f677f6a@anarchist> X-Original-References: <20151102155740.31fdee03@anarchist> Xref: csiph.com linux.debian.maint.python:7824 On Nov 02, 2015, at 11:07 PM, Sandro Tosi wrote: >I dont think I follow your description: looking at the debian repo, stable >has 1.5.6-5 while testing and unstable has 1.5.6-7; looking at the git repo >(as of http://anonscm.debian.org/cgit/python-modules/packages/python-pip.git) >all the branches are from 5 months ago except for master which is 3 weeks >old. so how do you make it work? So I'll preface this by saying I suck. I should really adopt the DEP-14 conventions so it's less confusing *and* document this in d/README.source. release-1.5.6 is for uploads to unstable and the last push three months ago on that branch was for 1.5.6-7. master is for what will be the new upstream whenever I get more time to work on it. release-1.5.6 branch is at least correct: http://anonscm.debian.org/cgit/python-modules/packages/python-pip.git/tree/debian/changelog?h=release-1.5.6 So it's not completely analogous to your case; I just wanted to point out that you can have whatever branches you want for other releases, and git-dpm should continue to Just Work. >say I have v1.0 packaged in master for unstable, and want to package >v2.0 for experimental: should I created a release-2.0 (and a relative >upstream-release-2.0 (what are the commands to obtain it, btw?)) and >then doing the exp packaging there? how do I manage when I want to >upload v2.0 to unstable? merge release-2.0 to master, >upstream-release-2.0 to upstream? what if then I want to backport a >previous revision of 1.0 to jessie? > >they might seem rare situations, but I face them everyday doing >backports for work and wanting to upload them to debian as well. Raphael can probably say more about this, and advocate for DEP-14, which in your case probably makes more sense than I have: http://dep.debian.net/deps/dep14/ It's probably worth some experimentation to see if DEP-14 is the right approach for you, and how that might inform updates to DPMT policy at some point. Just remember to document it in README.source. ;) trying-to-be-less-unhelpful-ly y'rs, -Barry