Path: csiph.com!au2pb.net!feeder.erje.net!1.eu.feeder.erje.net!nntpspool01.opticnetworks.net!aioe.org!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: Mon, 02 Nov 2015 23:00:03 +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 21:57:59 2015 Old-Return-Path: X-Amavis-Spam-Status: No, score=-6.88 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, FOURLA=0.1, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02] autolearn=ham autolearn_force=no X-Policyd-Weight: using cached result; rate: -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/13134 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20151102155740.31fdee03@anarchist Approved: robomod@news.nic.it Lines: 24 Sender: robomod@news.nic.it X-Original-Date: Mon, 2 Nov 2015 15:57:40 -0600 X-Original-Message-ID: <20151102155740.31fdee03@anarchist> X-Original-References: Xref: csiph.com linux.debian.maint.python:7821 On Nov 02, 2015, at 09:51 PM, Sandro Tosi wrote: >with the new DPMT repo layout and tools, what is the right way to >maintain multiple active branches for our packages? things like: > >1. unstable at v(ersion)3, bpo70 at v1 and bpo8 at v2 >2. unstable at v1, experimental at v2 > >all of them active, so in the 2. case there should be a way to keep >updating v1 and v2 releases (and so unstable and exp) as the come. I'm kind of doing something like this for python-pip. I'm (slowly) working on updating the whole stack to the latest upstream, but I'm also maintaining 1.5.6. I just created a release-1.5.6 branch and switch to that when I'm doing stable maintenance, then switch back to master when I'm working on the new upstream. I have an upstream-release-1.5.6 and of course when I `git-dpm c-p` on the release-1.5.6 branch, I end up in a patched-release-1.5.6 branch. Really, I don't do much special other than switch to the relevant branch; all other workflows seem to continue to do the right thing. Cheers, -Barry