Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.debian.maint.python > #7822

Re: How to maintain multiple branches (sid/bpo/exp etc)?

Path csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From Sandro Tosi <morph@debian.org>
Newsgroups linux.debian.maint.python
Subject Re: How to maintain multiple branches (sid/bpo/exp etc)?
Date Tue, 03 Nov 2015 00:10:01 +0100
Message-ID <qqwoF-34I-3@gated-at.bofh.it> (permalink)
References <qqviW-2bx-17@gated-at.bofh.it> <qqviX-2bx-23@gated-at.bofh.it>
X-Original-To debian-python <debian-python@lists.debian.org>
X-Mailbox-Line From debian-python-request@lists.debian.org Mon Nov 2 23:08:32 2015
Old-Return-Path <sandro.tosi@gmail.com>
X-Amavis-Spam-Status No, score=-7.677 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham autolearn_force=no
X-Policyd-Weight using cached result; rate: -7
Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:content-type; bh=rXjDPjkxwnSNuFVjylNAk2IE8eK/cu5UAwMbkc0sxTM=; b=yMqEW9mmKJ2R1FD7EdQCxHLovGid776TKhJbgfZNhS62oSpabppff1s0jMqem0n+Vt asBejnq5qQxg8wp9sELOlcEiLjluFAfNdVJFnSGTAzLIPtRC0jE3iiXqICRS4o0vBRqi 2zqX99xYKvW8E4UwbStlaAUP4GVY0pqmMLxPzEfLzHp54wPp3ZCAbhY46QiUmIX/NYDe OwbaDAFW117mOKj3jwIbCPEjdQkuqiRBGP1rYH4v+sgBJbktg2I7wlwp3u7HcdoUdbsm SOoWvh2OKL0+ODY5LJpXrYbmCghsI0I/1mTSSjBGHIEMEqFAsVmdYoylugZiNMsTltQw zy7g==
X-Received by 10.50.73.228 with SMTP id o4mr14377744igv.37.1446505694674; Mon, 02 Nov 2015 15:08:14 -0800 (PST)
MIME-Version 1.0
Sender robomod@news.nic.it
X-Google-Sender-Auth 9zhA6YqX-xp10jgmnEONrCbJlH4
Content-Type text/plain; charset=UTF-8
X-Mailing-List <debian-python@lists.debian.org> archive/latest/13135
List-ID <debian-python.lists.debian.org>
List-URL <https://lists.debian.org/debian-python/>
List-Archive https://lists.debian.org/msgid-search/CAB4XWXyBXtpczHAyNTnQhOjPEcs2z+=jVkyU2vMKHaV1-fpz0Q@mail.gmail.com
Approved robomod@news.nic.it
Lines 40
Organization linux.* mail to news gateway
X-Original-Date Mon, 2 Nov 2015 23:07:45 +0000
X-Original-Message-ID <CAB4XWXyBXtpczHAyNTnQhOjPEcs2z+=jVkyU2vMKHaV1-fpz0Q@mail.gmail.com>
X-Original-References <CAB4XWXww1ByNf8GyNhspJ-bgfA3WUajj0=7inW7QZnVCo1Z6Gg@mail.gmail.com> <20151102155740.31fdee03@anarchist>
X-Original-Sender sandro.tosi@gmail.com
Xref csiph.com linux.debian.maint.python:7822

Show key headers only | View raw


> 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.

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?

is that release-1.5.6 for update to debian stable? just by looking at
the repo, can someone tell that release-1.5.6 is for jessie and not
for wheezy and not even for experimental (if we consider master to
always target unstable) or even for unstable itself, as it contains
1.5.6-7? that seems a bit confusing (hopefully I  didnt understand)

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.

Cheers,
-- 
Sandro Tosi (aka morph, morpheus, matrixhasu)
My website: http://matrixhasu.altervista.org/
Me at Debian: http://wiki.debian.org/SandroTosi

Back to linux.debian.maint.python | Previous | NextPrevious in thread | Next in thread | Find similar


Thread

How to maintain multiple branches (sid/bpo/exp etc)? Sandro Tosi <morph@debian.org> - 2015-11-02 23:00 +0100
  Re: How to maintain multiple branches (sid/bpo/exp etc)? Barry Warsaw <barry@debian.org> - 2015-11-02 23:00 +0100
    Re: How to maintain multiple branches (sid/bpo/exp etc)? Sandro Tosi <morph@debian.org> - 2015-11-03 00:10 +0100
      Re: How to maintain multiple branches (sid/bpo/exp etc)? Barry Warsaw <barry@debian.org> - 2015-11-03 00:50 +0100
        Re: How to maintain multiple branches (sid/bpo/exp etc)? Sandro Tosi <morph@debian.org> - 2015-11-03 01:10 +0100
          Re: How to maintain multiple branches (sid/bpo/exp etc)? Barry Warsaw <barry@debian.org> - 2015-11-03 01:30 +0100
  Re: How to maintain multiple branches (sid/bpo/exp etc)? Raphael Hertzog <hertzog@debian.org> - 2015-11-03 09:50 +0100
    Re: How to maintain multiple branches (sid/bpo/exp etc)? Barry Warsaw <barry@debian.org> - 2015-11-03 16:30 +0100

csiph-web