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

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

From	Barry Warsaw <barry@debian.org>
Newsgroups	linux.debian.maint.python
Subject	Re: How to maintain multiple branches (sid/bpo/exp etc)?
Date	2015-11-03 16:30 +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>
Organization	The Organization of Unorganized Woozalists

Show all headers | 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