Re: How to maintain multiple branches (sid/bpo/exp etc)?
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
Reply to: