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

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	Barry Warsaw <barry@debian.org>
Newsgroups	linux.debian.maint.python
Subject	Re: How to maintain multiple branches (sid/bpo/exp etc)?
Date	Tue, 03 Nov 2015 16:30:02 +0100
Message-ID	<qqLH4-4sG-13@gated-at.bofh.it> (permalink)
References	<qqviW-2bx-17@gated-at.bofh.it> <qqFrY-jV-17@gated-at.bofh.it>
X-Original-To	debian-python@lists.debian.org
X-Mailbox-Line	From debian-python-request@lists.debian.org Tue Nov 3 15:25:36 2015
Old-Return-Path	<barry@debian.org>
X-Amavis-Spam-Status	No, score=-6.98 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, 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	<debian-python@lists.debian.org> archive/latest/13142
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/20151103092501.49ca6734@anarchist
Approved	robomod@news.nic.it
Lines	15
Sender	robomod@news.nic.it
X-Original-Date	Tue, 3 Nov 2015 09:25:01 -0600
X-Original-Message-ID	<20151103092501.49ca6734@anarchist>
X-Original-References	<CAB4XWXww1ByNf8GyNhspJ-bgfA3WUajj0=7inW7QZnVCo1Z6Gg@mail.gmail.com> <20151103084938.GC20720@home.ouaza.com>
Xref	csiph.com linux.debian.maint.python:7829

Show key headers only | View raw

On Nov 03, 2015, at 09:49 AM, Raphael Hertzog wrote:

>I experienced yesterday how to merge a branch into another branch (merging
>experimental with 1.8 into unstable that had 1.7) and the least I can say is
>that it was not flawless... I already reported the issue here:
>https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801667

I could be misremembering, but I think bzr-buildpackage (UDD?) will unapply
the patches before it tries to merge in a new version.  It's very handy to
have the patch-applied branch to work on directly for daily packaging tasks,
but I do think when merging branches you have to do that on the *unpatched*
tree.

Cheers,
-Barry

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

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