[Pkg-giraffe-discuss] Z-push: Q about bug fix

[Guido Günther]

Hi,
On Tue, Feb 06, 2018 at 08:56:43AM +0100, Roel van Meer wrote:
> Hi everyone:
> 
> I've got a short question about a Z-push bug fix. Bug #889518 was filed for
> z-push 2.3.8-2, but the debian/sid branch already contains 2.4.0~beta1-1.
> 
> So, what do I do now? Branch to 2.3.8-2 to debian/testing and fix it there?
> Or should I better have created a debian/experimental branch to track the
> beta version in, as is done in the kopanocore repo?

I usually track experimental on debian/experimental and merge back on
forth between d/sid and d/experimental.

> I couldn't find any info on that in the maintainers guide. So any pointers
> or a high-quality package that I can use as an example are much appreciated!

Three solution:

 1 fix the bug in 2.4 and upload that to d/sid
 2 create a branch and fix it there. d/testing sounds like a reasonable
   name although you still upload to unstable.
 3 create the branch only locally and only push the tags not the branch
   itself. 

3.) looks like the cleanest to me if the lifetime of 2.3.8 in
testing/sid is only about one or two months. It gets tedious if you need
to fix more stuff.

HTH,
 -- Guido